From fc152f87a98b6beaa5cf57445fff9fbfbd36f437 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/rnd-create.tpl.php | 34 ++++++++++++++++----------------
 Theme/Backend/rnd-list.tpl.php   | 14 ++++++-------
 Theme/backend/rnd-list.tpl.php   | 14 ++++++-------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Theme/Backend/rnd-create.tpl.php b/Theme/Backend/rnd-create.tpl.php
index 69c81b4..b793a50 100644
--- a/Theme/Backend/rnd-create.tpl.php
+++ b/Theme/Backend/rnd-create.tpl.php
@@ -16,35 +16,35 @@
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-50">
-    <header><h1><?= $this->l11n->lang['ResearchDevelopment']['Project']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('ResearchDevelopment', 'Project'); ?></h1></header>
     <div class="inner">
         <form>
             <table class="layout wf-100">
-                <tr><td colspan="3"><label for="iName"><?= $this->l11n->lang['ResearchDevelopment']['Name']; ?></label>
+                <tr><td colspan="3"><label for="iName"><?= $this->l11n->getText('ResearchDevelopment', 'Name'); ?></label>
                 <tr><td colspan="2"><input type="text" id="iName" name="name" placeholder=""><td>
-                <tr><td colspan="3"><label for="iDescription"><?= $this->l11n->lang['ResearchDevelopment']['Description']; ?></label>
+                <tr><td colspan="3"><label for="iDescription"><?= $this->l11n->getText('ResearchDevelopment', 'Description'); ?></label>
                 <tr><td colspan="2"><textarea id="iDescription" name="description"></textarea><td>
-                <tr><td colspan="3"><label for="iStatus"><?= $this->l11n->lang['ResearchDevelopment']['Status']; ?></label>
+                <tr><td colspan="3"><label for="iStatus"><?= $this->l11n->getText('ResearchDevelopment', 'Status'); ?></label>
                 <tr><td colspan="2"><select id="iStatus" name="status">
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::ACTIVE ?>"><?= $this->l11n->lang['ResearchDevelopment']['Active']; ?>
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::INACTIVE ?>"><?= $this->l11n->lang['ResearchDevelopment']['Inactive']; ?>
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::FINISHED ?>"><?= $this->l11n->lang['ResearchDevelopment']['Finished']; ?>
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::CANCELED ?>"><?= $this->l11n->lang['ResearchDevelopment']['Canceled']; ?>
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::HOLD ?>"><?= $this->l11n->lang['ResearchDevelopment']['Hold']; ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::ACTIVE ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Active'); ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::INACTIVE ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Inactive'); ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::FINISHED ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Finished'); ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::CANCELED ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Canceled'); ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectStatus::HOLD ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Hold'); ?>
                         </select><td>
-                <tr><td colspan="3"><label for="iFiles"><?= $this->l11n->lang['ResearchDevelopment']['Files']; ?></label>
+                <tr><td colspan="3"><label for="iFiles"><?= $this->l11n->getText('ResearchDevelopment', 'Files'); ?></label>
                 <tr><td colspan="2"><input type="file" id="iFiles" name="file" multiple><td>
-                <tr><td colspan="3"><label for="iBudget"><?= $this->l11n->lang['ResearchDevelopment']['Budget']; ?></label>
+                <tr><td colspan="3"><label for="iBudget"><?= $this->l11n->getText('ResearchDevelopment', 'Budget'); ?></label>
                 <tr><td colspan="2"><input type="text" id="iBudget" name="budget" placeholder=""><td>
-                <tr><td><label for="iDue"><?= $this->l11n->lang['ResearchDevelopment']['Start']; ?></label><td><label for="iDue"><?= $this->l11n->lang['ResearchDevelopment']['Due']; ?></label><td>
+                <tr><td><label for="iDue"><?= $this->l11n->getText('ResearchDevelopment']['Start']; ?></label><td><label for="iDue"><?= $this->l11n->lang['ResearchDevelopment', 'Due'); ?></label><td>
                 <tr><td><input type="datetime-local" id="iDue" name="due"><td><input type="datetime-local" id="iDue" name="due"><td>
-                <tr><td><label for="iResponsibility"><?= $this->l11n->lang['ResearchDevelopment']['Responsibility']; ?></label><td><label for="iUser"><?= $this->l11n->lang['ResearchDevelopment']['UserGroup']; ?></label><td>
+                <tr><td><label for="iResponsibility"><?= $this->l11n->getText('ResearchDevelopment']['Responsibility']; ?></label><td><label for="iUser"><?= $this->l11n->lang['ResearchDevelopment', 'UserGroup'); ?></label><td>
                 <tr><td><select id="iStatus" name="status">
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectResponsibility::MANAGER ?>"><?= $this->l11n->lang['ResearchDevelopment']['Manager']; ?>
-                            <option value="<?= \Modules\ProjectManagement\Models\ProjectResponsibility::OTHER ?>"><?= $this->l11n->lang['ResearchDevelopment']['Other']; ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectResponsibility::MANAGER ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Manager'); ?>
+                            <option value="<?= \Modules\ProjectManagement\Models\ProjectResponsibility::OTHER ?>"><?= $this->l11n->getText('ResearchDevelopment', 'Other'); ?>
                         </select>
-                    <td><input type="text" id="iUser" name="user" placeholder=""><td><button><?= $this->l11n->lang[0]['Add']; ?></button>
-                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->lang[0]['Create']; ?>">
+                    <td><input type="text" id="iUser" name="user" placeholder=""><td><button><?= $this->l11n->getText(0, 'Add'); ?></button>
+                <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->getText(0, 'Create'); ?>">
             </table>
         </form>
     </div>
diff --git a/Theme/Backend/rnd-list.tpl.php b/Theme/Backend/rnd-list.tpl.php
index 065a341..a98256c 100644
--- a/Theme/Backend/rnd-list.tpl.php
+++ b/Theme/Backend/rnd-list.tpl.php
@@ -28,14 +28,14 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['ResearchDevelopment']['Projects']; ?></caption>
+        <caption><?= $this->l11n->getText('ResearchDevelopment', 'Projects'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['ResearchDevelopment']['Name']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Creator']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('ResearchDevelopment', 'Name'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Creator'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/rnd-list.tpl.php b/Theme/backend/rnd-list.tpl.php
index 065a341..a98256c 100644
--- a/Theme/backend/rnd-list.tpl.php
+++ b/Theme/backend/rnd-list.tpl.php
@@ -28,14 +28,14 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['ResearchDevelopment']['Projects']; ?></caption>
+        <caption><?= $this->l11n->getText('ResearchDevelopment', 'Projects'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang[0]['ID']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Status']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['ResearchDevelopment']['Name']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Creator']; ?>
-            <td><?= $this->l11n->lang['ResearchDevelopment']['Created']; ?>
+            <td><?= $this->l11n->getText(0, 'ID'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Status'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('ResearchDevelopment', 'Name'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Creator'); ?>
+            <td><?= $this->l11n->getText('ResearchDevelopment', 'Created'); ?>
         <tfoot>
         <tr><td colspan="5"><?= $footerView->render(); ?>
         <tbody>
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
         <tr>
-            <td colspan="5" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+            <td colspan="5" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>