From 8f1fc788e57d82c79c9b367b1d602813dbd1ef06 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 2 Jul 2016 14:14:31 +0200
Subject: [PATCH] Language display optimized

Language is now no longer direct array access but provided through a
function. This can be later used to hot load language files instead of
pre-loading them.
---
 Theme/Backend/account-list.tpl.php          |  6 +-
 Theme/Backend/entries.tpl.php               | 84 ++++++++++-----------
 Theme/Backend/gl-create.tpl.php             | 10 +--
 Theme/Backend/journal-list.tpl.php          |  8 +-
 Theme/Backend/stack-archive-list.tpl.php    | 12 +--
 Theme/Backend/stack-create.tpl.php          | 14 ++--
 Theme/Backend/stack-list.tpl.php            | 12 +--
 Theme/Backend/stack-predefined-list.tpl.php | 14 ++--
 Theme/backend/entries.tpl.php               | 84 ++++++++++-----------
 Theme/backend/gl-list.tpl.php               |  8 +-
 Theme/backend/journal-list.tpl.php          |  8 +-
 Theme/backend/stack-archive-list.tpl.php    | 12 +--
 Theme/backend/stack-create.tpl.php          | 14 ++--
 13 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/Theme/Backend/account-list.tpl.php b/Theme/Backend/account-list.tpl.php
index 6e7fa7e..1122349 100644
--- a/Theme/Backend/account-list.tpl.php
+++ b/Theme/Backend/account-list.tpl.php
@@ -1,11 +1,11 @@
 <template id="entry-list-tpl">
     <div id="entry-list" class="box" style="z-index: 99; position: relative; top: 20px; display: block; margin: 0 auto; width: 20%;">
         <table class="table">
-            <caption><?= $this->l11n->lang['Accounting']['Accounts']; ?></caption>
+            <caption><?= $this->l11n->getText('Accounting', 'Accounts'); ?></caption>
             <thead>
             <tr>
-                <td><?= $this->l11n->lang[0]['ID']; ?>
-                <td class="wf-100"><?= $this->l11n->lang['Accounting']['Account']; ?>
+                <td><?= $this->l11n->getText(0, 'ID'); ?>
+                <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Account'); ?>
             <tbody>
         </table>
     </div>
diff --git a/Theme/Backend/entries.tpl.php b/Theme/Backend/entries.tpl.php
index 064c2a6..dd8c136 100644
--- a/Theme/Backend/entries.tpl.php
+++ b/Theme/Backend/entries.tpl.php
@@ -28,10 +28,10 @@ $footerView->setResults(1);
         <form>
             <table class="layout wf-100">
                 <tr>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['Account']; ?></label>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['CostObject']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['EntryDate']; ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'Account'); ?></label>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'CostObject'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'EntryDate'); ?>
                 <tr>
                     <td><span class="input"><button type="button" id="account-start" formaction="" data-action='[{"type": "popup", "tpl": "entry-list-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 1000}]'><i class="fa fa-book"></i>
                             </button><input type="number" id="iId" min="1" name="id" required></span>
@@ -41,10 +41,10 @@ $footerView->setResults(1);
                             </button><input type="number" id="iId" min="1" name="id" required></span>
                     <td><input type="datetime-local" id="iId" min="1" name="id" required>
                 <tr>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?></label>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?></label>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
                 <tr>
                     <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
                             </button><input type="number" id="iId" min="1" name="id" required></span>
@@ -54,7 +54,7 @@ $footerView->setResults(1);
                             </button><input type="number" id="iId" min="1" name="id" required></span>
                     <td><input type="datetime-local" id="iId" min="1" name="id" required>
                 <tr>
-                    <td colspan="4"><input type="submit" value="<?= $this->l11n->lang[0]['Search'] ?>">
+                    <td colspan="4"><input type="submit" value="<?= $this->l11n->getText(0, 'Search') ?>">
             </table>
         </form>
     </div>
@@ -63,31 +63,31 @@ $footerView->setResults(1);
 <div class="box w-100">
     <div class="tabular-2">
         <ul class="tab-links">
-            <li><label for="c-tab2-1"><?= $this->l11n->lang['Accounting']['List']; ?></label></li>
-            <li><label for="c-tab2-2"><?= $this->l11n->lang['Accounting']['Evaluation']; ?></label></li>
-            <li><label for="c-tab2-3"><?= $this->l11n->lang['Accounting']['Charts']; ?></label></li>
+            <li><label for="c-tab2-1"><?= $this->l11n->getText('Accounting', 'List'); ?></label></li>
+            <li><label for="c-tab2-2"><?= $this->l11n->getText('Accounting', 'Evaluation'); ?></label></li>
+            <li><label for="c-tab2-3"><?= $this->l11n->getText('Accounting', 'Charts'); ?></label></li>
         </ul>
         <div class="tab-content">
             <input type="radio" id="c-tab2-1" name="tabular-2" checked>
             <div class="tab">
                 <section class="wf-100">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['Entries'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'Entries') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['EntryDate']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Receipt']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Debit']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Credit']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Text']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ContraAccount']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['CostObject']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ReceiptDate']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ExternalVoucher']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'EntryDate'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Receipt'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Debit'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Credit'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Text'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ContraAccount'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostObject'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ReceiptDate'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ExternalVoucher'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
                         <tfoot>
                         <tr>
                             <td colspan="13"><?= $footerView->render(); ?>
@@ -97,7 +97,7 @@ $footerView->setResults(1);
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
@@ -106,55 +106,55 @@ $footerView->setResults(1);
             <div class="tab tab-2">
                 <section class="box w-33 floatLeft">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['Accounts'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'Accounts') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
                 <section class="box w-33 floatLeft">
                     <table class="table floatLeft">
-                        <caption><?= $this->l11n->lang['Accounting']['CostCenter'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'CostCenter') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
                 <section class="box w-33 floatLeft">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['CostObject'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'CostObject') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
diff --git a/Theme/Backend/gl-create.tpl.php b/Theme/Backend/gl-create.tpl.php
index 4132238..ec4c14b 100644
--- a/Theme/Backend/gl-create.tpl.php
+++ b/Theme/Backend/gl-create.tpl.php
@@ -16,17 +16,17 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50">
-    <header><h1><?= $this->l11n->lang['Accounting']['GL']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Accounting', 'GL'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iId"><?= $this->l11n->lang[0]['ID']; ?></label>
+                <tr><td><label for="iId"><?= $this->l11n->getText(0, 'ID'); ?></label>
                 <tr><td><input type="text" id="iId" name="id">
-                <tr><td><label for="iName"><?= $this->l11n->lang['Accounting']['Name']; ?></label>
+                <tr><td><label for="iName"><?= $this->l11n->getText('Accounting', 'Name'); ?></label>
                 <tr><td><input type="text" id="iName" name="name">
-                <tr><td><label for="iParent"><?= $this->l11n->lang['Accounting']['Parent']; ?></label>
+                <tr><td><label for="iParent"><?= $this->l11n->getText('Accounting', 'Parent'); ?></label>
                 <tr><td><input type="text" id="iParent" name="parent">
-                <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>">
+                <tr><td><input type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/journal-list.tpl.php b/Theme/Backend/journal-list.tpl.php
index ea91277..44d101d 100644
--- a/Theme/Backend/journal-list.tpl.php
+++ b/Theme/Backend/journal-list.tpl.php
@@ -28,11 +28,11 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['Journal']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'Journal'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/stack-archive-list.tpl.php b/Theme/Backend/stack-archive-list.tpl.php
index 77668b6..10ebe94 100644
--- a/Theme/Backend/stack-archive-list.tpl.php
+++ b/Theme/Backend/stack-archive-list.tpl.php
@@ -28,13 +28,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['BatchPostings']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'BatchPostings'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/stack-create.tpl.php b/Theme/Backend/stack-create.tpl.php
index 090f084..641d8dd 100644
--- a/Theme/Backend/stack-create.tpl.php
+++ b/Theme/Backend/stack-create.tpl.php
@@ -19,19 +19,19 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50">
-    <header><h1><?= $this->l11n->lang['Accounting']['Stack']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Accounting', 'Stack'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iName"><?= $this->l11n->lang['Accounting']['Name']; ?></label>
+                <tr><td><label for="iName"><?= $this->l11n->getText('Accounting', 'Name'); ?></label>
                 <tr><td><input id="iName" name="name" type="text">
-                <tr><td><label for="iType"><?= $this->l11n->lang['Accounting']['Type']; ?></label>
+                <tr><td><label for="iType"><?= $this->l11n->getText('Accounting', 'Type'); ?></label>
                 <tr><td><select id="iType" name="type">
-                            <option value=""><?= $this->l11n->lang['Accounting']['TAccount']; ?>
-                            <option value=""><?= $this->l11n->lang['Accounting']['Incoming']; ?>
-                            <option value=""><?= $this->l11n->lang['Accounting']['Outgoing']; ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'TAccount'); ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'Incoming'); ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'Outgoing'); ?>
                         </select>
-                <tr><td><input name="submit" type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>">
+                <tr><td><input name="submit" type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/stack-list.tpl.php b/Theme/Backend/stack-list.tpl.php
index 77668b6..10ebe94 100644
--- a/Theme/Backend/stack-list.tpl.php
+++ b/Theme/Backend/stack-list.tpl.php
@@ -28,13 +28,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['BatchPostings']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'BatchPostings'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/Backend/stack-predefined-list.tpl.php b/Theme/Backend/stack-predefined-list.tpl.php
index b6d3ab9..19634fd 100644
--- a/Theme/Backend/stack-predefined-list.tpl.php
+++ b/Theme/Backend/stack-predefined-list.tpl.php
@@ -28,14 +28,14 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['BatchPostings']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'BatchPostings'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Due']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Due'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/entries.tpl.php b/Theme/backend/entries.tpl.php
index 064c2a6..dd8c136 100644
--- a/Theme/backend/entries.tpl.php
+++ b/Theme/backend/entries.tpl.php
@@ -28,10 +28,10 @@ $footerView->setResults(1);
         <form>
             <table class="layout wf-100">
                 <tr>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['Account']; ?></label>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['CostObject']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['EntryDate']; ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'Account'); ?></label>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'CostObject'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'EntryDate'); ?>
                 <tr>
                     <td><span class="input"><button type="button" id="account-start" formaction="" data-action='[{"type": "popup", "tpl": "entry-list-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 1000}]'><i class="fa fa-book"></i>
                             </button><input type="number" id="iId" min="1" name="id" required></span>
@@ -41,10 +41,10 @@ $footerView->setResults(1);
                             </button><input type="number" id="iId" min="1" name="id" required></span>
                     <td><input type="datetime-local" id="iId" min="1" name="id" required>
                 <tr>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?></label>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
-                    <td><label for="iAccountStart"><?= $this->l11n->lang['Accounting']['To']; ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?></label>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
+                    <td><label for="iAccountStart"><?= $this->l11n->getText('Accounting', 'To'); ?>
                 <tr>
                     <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
                             </button><input type="number" id="iId" min="1" name="id" required></span>
@@ -54,7 +54,7 @@ $footerView->setResults(1);
                             </button><input type="number" id="iId" min="1" name="id" required></span>
                     <td><input type="datetime-local" id="iId" min="1" name="id" required>
                 <tr>
-                    <td colspan="4"><input type="submit" value="<?= $this->l11n->lang[0]['Search'] ?>">
+                    <td colspan="4"><input type="submit" value="<?= $this->l11n->getText(0, 'Search') ?>">
             </table>
         </form>
     </div>
@@ -63,31 +63,31 @@ $footerView->setResults(1);
 <div class="box w-100">
     <div class="tabular-2">
         <ul class="tab-links">
-            <li><label for="c-tab2-1"><?= $this->l11n->lang['Accounting']['List']; ?></label></li>
-            <li><label for="c-tab2-2"><?= $this->l11n->lang['Accounting']['Evaluation']; ?></label></li>
-            <li><label for="c-tab2-3"><?= $this->l11n->lang['Accounting']['Charts']; ?></label></li>
+            <li><label for="c-tab2-1"><?= $this->l11n->getText('Accounting', 'List'); ?></label></li>
+            <li><label for="c-tab2-2"><?= $this->l11n->getText('Accounting', 'Evaluation'); ?></label></li>
+            <li><label for="c-tab2-3"><?= $this->l11n->getText('Accounting', 'Charts'); ?></label></li>
         </ul>
         <div class="tab-content">
             <input type="radio" id="c-tab2-1" name="tabular-2" checked>
             <div class="tab">
                 <section class="wf-100">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['Entries'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'Entries') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['EntryDate']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Receipt']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Debit']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Credit']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Text']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ContraAccount']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['CostObject']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ReceiptDate']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['ExternalVoucher']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'EntryDate'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Receipt'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Debit'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Credit'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Text'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ContraAccount'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostObject'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ReceiptDate'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'ExternalVoucher'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
                         <tfoot>
                         <tr>
                             <td colspan="13"><?= $footerView->render(); ?>
@@ -97,7 +97,7 @@ $footerView->setResults(1);
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
@@ -106,55 +106,55 @@ $footerView->setResults(1);
             <div class="tab tab-2">
                 <section class="box w-33 floatLeft">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['Accounts'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'Accounts') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
                 <section class="box w-33 floatLeft">
                     <table class="table floatLeft">
-                        <caption><?= $this->l11n->lang['Accounting']['CostCenter'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'CostCenter') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['CostCenter']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'CostCenter'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
                 <section class="box w-33 floatLeft">
                     <table class="table">
-                        <caption><?= $this->l11n->lang['Accounting']['CostObject'] ?></caption>
+                        <caption><?= $this->l11n->getText('Accounting', 'CostObject') ?></caption>
                         <thead>
                         <tr>
-                            <td><?= $this->l11n->lang['Accounting']['Account']; ?>
-                            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-                            <td><?= $this->l11n->lang['Accounting']['Total']; ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Account'); ?>
+                            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+                            <td><?= $this->l11n->getText('Accounting', 'Total'); ?>
                         <tbody>
                         <?php $count = 0;
                         foreach ([] as $key => $value) : $count++; ?>
                         <?php endforeach; ?>
                         <?php if ($count === 0) : ?>
                         <tr>
-                            <td colspan="13" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+                            <td colspan="13" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                                 <?php endif; ?>
                     </table>
                 </section>
diff --git a/Theme/backend/gl-list.tpl.php b/Theme/backend/gl-list.tpl.php
index 19dbd08..a079361 100644
--- a/Theme/backend/gl-list.tpl.php
+++ b/Theme/backend/gl-list.tpl.php
@@ -28,11 +28,11 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['GL']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'GL'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/journal-list.tpl.php b/Theme/backend/journal-list.tpl.php
index ea91277..44d101d 100644
--- a/Theme/backend/journal-list.tpl.php
+++ b/Theme/backend/journal-list.tpl.php
@@ -28,11 +28,11 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['Journal']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'Journal'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/stack-archive-list.tpl.php b/Theme/backend/stack-archive-list.tpl.php
index 77668b6..10ebe94 100644
--- a/Theme/backend/stack-archive-list.tpl.php
+++ b/Theme/backend/stack-archive-list.tpl.php
@@ -28,13 +28,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Accounting']['BatchPostings']; ?></caption>
+        <caption><?= $this->l11n->getText('Accounting', 'BatchPostings'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Accounting']['Name']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Creator']; ?>
-            <td><?= $this->l11n->lang['Accounting']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Accounting', 'Name'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Creator'); ?>
+            <td><?= $this->l11n->getText('Accounting', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?>
             <td>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
-        <tr><td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/stack-create.tpl.php b/Theme/backend/stack-create.tpl.php
index 090f084..641d8dd 100644
--- a/Theme/backend/stack-create.tpl.php
+++ b/Theme/backend/stack-create.tpl.php
@@ -19,19 +19,19 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50">
-    <header><h1><?= $this->l11n->lang['Accounting']['Stack']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Accounting', 'Stack'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td><label for="iName"><?= $this->l11n->lang['Accounting']['Name']; ?></label>
+                <tr><td><label for="iName"><?= $this->l11n->getText('Accounting', 'Name'); ?></label>
                 <tr><td><input id="iName" name="name" type="text">
-                <tr><td><label for="iType"><?= $this->l11n->lang['Accounting']['Type']; ?></label>
+                <tr><td><label for="iType"><?= $this->l11n->getText('Accounting', 'Type'); ?></label>
                 <tr><td><select id="iType" name="type">
-                            <option value=""><?= $this->l11n->lang['Accounting']['TAccount']; ?>
-                            <option value=""><?= $this->l11n->lang['Accounting']['Incoming']; ?>
-                            <option value=""><?= $this->l11n->lang['Accounting']['Outgoing']; ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'TAccount'); ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'Incoming'); ?>
+                            <option value=""><?= $this->l11n->getText('Accounting', 'Outgoing'); ?>
                         </select>
-                <tr><td><input name="submit" type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>">
+                <tr><td><input name="submit" type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>">
             </table>
         </form>
     </div>