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

see previous commit
---
 Theme/backend/news-archive.tpl.php | 12 ++++++------
 Theme/backend/news-create.tpl.php  | 30 +++++++++++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Theme/backend/news-archive.tpl.php b/Theme/backend/news-archive.tpl.php
index 28f6176..ddd46d2 100644
--- a/Theme/backend/news-archive.tpl.php
+++ b/Theme/backend/news-archive.tpl.php
@@ -25,13 +25,13 @@ $footerView->setPage(1);
 echo $this->getData('nav')->render(); ?>
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['News']['Archive'] ?></caption>
+        <caption><?= $this->l11n->getText('News', 'Archive') ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang['News']['Type']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['News']['Title']; ?>
-            <td><?= $this->l11n->lang['News']['Author']; ?>
-            <td><?= $this->l11n->lang['News']['Date']; ?>
+            <td><?= $this->l11n->getText('News', 'Type'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('News', 'Title'); ?>
+            <td><?= $this->l11n->getText('News', 'Author'); ?>
+            <td><?= $this->l11n->getText('News', 'Date'); ?>
                 <tfoot>
         <tr>
             <td colspan="4"><?= $footerView->render(); ?>
@@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
                 <?php endforeach; ?>
                 <?php if($count === 0) : ?>
-        <tr><td colspan="4" class="empty"><?= $this->l11n->lang[0]['Empty']; ?>
+        <tr><td colspan="4" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
                 <?php endif; ?>
     </table>
 </div>
diff --git a/Theme/backend/news-create.tpl.php b/Theme/backend/news-create.tpl.php
index 0195302..e097b93 100644
--- a/Theme/backend/news-create.tpl.php
+++ b/Theme/backend/news-create.tpl.php
@@ -47,8 +47,8 @@ echo $this->getData('nav')->render(); ?>
     <div class="box w-100">
         <div class="tabular">
             <ul class="tab-links">
-                <li><label for="c-tab-1"><?= $this->l11n->lang['News']['Plain'] ?></label>
-                <li><label for="c-tab-2"><?= $this->l11n->lang['News']['Preview'] ?></label>
+                <li><label for="c-tab-1"><?= $this->l11n->getText('News', 'Plain') ?></label>
+                <li><label for="c-tab-2"><?= $this->l11n->getText('News', 'Preview') ?></label>
             </ul>
             <div class="tab-content">
                 <input type="radio" id="c-tab-1" name="tabular-1" checked>
@@ -69,13 +69,13 @@ echo $this->getData('nav')->render(); ?>
         <div class="inner">
             <form id="newsForm">
                 <table class="layout wf-100">
-                    <tr><td colspan="2"><label for="publish"><?= $this->l11n->lang['News']['Status'] ?></label>
+                    <tr><td colspan="2"><label for="publish"><?= $this->l11n->getText('News', 'Status') ?></label>
                     <tr><td colspan="2"><select>
-                                <option selected><?= $this->l11n->lang['News']['Draft'] ?>
-                                <option><?= $this->l11n->lang['News']['Visible'] ?>
-                    <tr><td colspan="2"><label for="publish"><?= $this->l11n->lang['News']['Publish'] ?></label>
+                                <option selected><?= $this->l11n->getText('News', 'Draft') ?>
+                                <option><?= $this->l11n->getText('News', 'Visible') ?>
+                    <tr><td colspan="2"><label for="publish"><?= $this->l11n->getText('News', 'Publish') ?></label>
                     <tr><td colspan="2"><input type="datetime-local" id="publish" value="<?= (new \DateTime('NOW'))->format('Y-m-d\TH:i:s') ?>">
-                    <tr><td><input type="submit" value="<?= $this->l11n->lang[0]['Delete'] ?>"><td class="rightText"><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>"> <input type="submit" value="<?= $this->l11n->lang['News']['Publish'] ?>">
+                    <tr><td><input type="submit" value="<?= $this->l11n->getText(0]['Delete'] ?>"><td class="rightText"><input type="submit" value="<?= $this->l11n->lang[0]['Save'] ?>"> <input type="submit" value="<?= $this->l11n->lang['News', 'Publish') ?>">
                 </table>
             </form>
         </div>
@@ -84,10 +84,10 @@ echo $this->getData('nav')->render(); ?>
         <div class="inner">
             <form id="newsForm">
                 <table class="layout wf-100">
-                    <tr><td colspan="2"><label><?= $this->l11n->lang['News']['Type'] ?></label>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="1" id="news" checked><label for="news"><?= $this->l11n->lang['News']['News'] ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="2" id="headline"><label for="headline"><?= $this->l11n->lang['News']['Headline'] ?></label></span>
-                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="3" id="link"><label for="link"><?= $this->l11n->lang['News']['Link'] ?></label></span>
+                    <tr><td colspan="2"><label><?= $this->l11n->getText('News', 'Type') ?></label>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="1" id="news" checked><label for="news"><?= $this->l11n->getText('News', 'News') ?></label></span>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="2" id="headline"><label for="headline"><?= $this->l11n->getText('News', 'Headline') ?></label></span>
+                    <tr><td colspan="2"><span class="radio"><input type="radio" name="type" form="newsForm" value="3" id="link"><label for="link"><?= $this->l11n->getText('News', 'Link') ?></label></span>
                 </table>
             </form>
         </div>
@@ -96,9 +96,9 @@ echo $this->getData('nav')->render(); ?>
         <div class="inner">
             <form id="newsForm">
                 <table class="layout wf-100">
-                    <tr><td><label for="permission"><?= $this->l11n->lang['News']['Permissions'] ?></label>
+                    <tr><td><label for="permission"><?= $this->l11n->getText('News', 'Permissions') ?></label>
                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="permission"><input type="hidden" form="newsForm" name="permission"></span>
-                    <tr><td><button><?= $this->l11n->lang[0]['Add'] ?></button>
+                    <tr><td><button><?= $this->l11n->getText(0, 'Add') ?></button>
                 </table>
             </form>
         </div>
@@ -107,9 +107,9 @@ echo $this->getData('nav')->render(); ?>
         <div class="inner">
             <form id="newsForm">
                 <table class="layout wf-100">
-                    <tr><td colspan="2"><label for="groups"><?= $this->l11n->lang['News']['Groups'] ?></label>
+                    <tr><td colspan="2"><label for="groups"><?= $this->l11n->getText('News', 'Groups') ?></label>
                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input  type="text" id="groups"><input type="hidden" form="newsForm" name="groups"></span>
-                    <tr><td><button><?= $this->l11n->lang[0]['Add'] ?></button>
+                    <tr><td><button><?= $this->l11n->getText(0, 'Add') ?></button>
                 </table>
             </form>
         </div>