From f55c1934f6a4f09c0162bcd4de4ac1ac94855b03 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/mid-side.tpl.php | 4 ++--
 Theme/Backend/mid.tpl.php      | 2 +-
 Theme/backend/mid-side.tpl.php | 4 ++--
 Theme/backend/mid.tpl.php      | 2 +-
 Theme/backend/side.tpl.php     | 4 ++--
 Theme/backend/top.tpl.php      | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Theme/Backend/mid-side.tpl.php b/Theme/Backend/mid-side.tpl.php
index 8eff47c..e3b5349 100644
--- a/Theme/Backend/mid-side.tpl.php
+++ b/Theme/Backend/mid-side.tpl.php
@@ -20,7 +20,7 @@
 /* Looping through all links */
 if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) {
     echo '<div class="b b-5 c3-2 c3" id="i3-2-5">'
-         . '<h1>' . $this->l11n->lang[0]['Navigation']
+         . '<h1>' . $this->l11n->getText(0, 'Navigation')
          . '<i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>'
          . '</h1>'
          . '<div class="bc-1">'
@@ -31,7 +31,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE]))
             /** @var array $data */
             if ($link['nav_parent'] == $data[1]) {
                 echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->l11n->lang[5][$link['nav_name']] . '</a>';
+                     . $this->l11n->getText(5, $link['nav_name']) . '</a>';
             }
         }
     }
diff --git a/Theme/Backend/mid.tpl.php b/Theme/Backend/mid.tpl.php
index 8899d26..e98bd71 100644
--- a/Theme/Backend/mid.tpl.php
+++ b/Theme/Backend/mid.tpl.php
@@ -23,7 +23,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])) {
         foreach ($parent as $link) {
             if ($link['nav_parent'] == $this->parent) {
                 echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->l11n->lang['Navigation'][$link['nav_name']] . '</a>';
+                     . $this->l11n->getText('Navigation', $link['nav_name']) . '</a>';
             }
         }
     }
diff --git a/Theme/backend/mid-side.tpl.php b/Theme/backend/mid-side.tpl.php
index 8eff47c..e3b5349 100644
--- a/Theme/backend/mid-side.tpl.php
+++ b/Theme/backend/mid-side.tpl.php
@@ -20,7 +20,7 @@
 /* Looping through all links */
 if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE])) {
     echo '<div class="b b-5 c3-2 c3" id="i3-2-5">'
-         . '<h1>' . $this->l11n->lang[0]['Navigation']
+         . '<h1>' . $this->l11n->getText(0, 'Navigation')
          . '<i class="fa fa-minus min"></i><i class="fa fa-plus max vh"></i>'
          . '</h1>'
          . '<div class="bc-1">'
@@ -31,7 +31,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT_SIDE]))
             /** @var array $data */
             if ($link['nav_parent'] == $data[1]) {
                 echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->l11n->lang[5][$link['nav_name']] . '</a>';
+                     . $this->l11n->getText(5, $link['nav_name']) . '</a>';
             }
         }
     }
diff --git a/Theme/backend/mid.tpl.php b/Theme/backend/mid.tpl.php
index 8899d26..e98bd71 100644
--- a/Theme/backend/mid.tpl.php
+++ b/Theme/backend/mid.tpl.php
@@ -23,7 +23,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::CONTENT])) {
         foreach ($parent as $link) {
             if ($link['nav_parent'] == $this->parent) {
                 echo '<li><a href="' . \phpOMS\Uri\UriFactory::build($link['nav_uri']) . '">'
-                     . $this->l11n->lang['Navigation'][$link['nav_name']] . '</a>';
+                     . $this->l11n->getText('Navigation', $link['nav_name']) . '</a>';
             }
         }
     }
diff --git a/Theme/backend/side.tpl.php b/Theme/backend/side.tpl.php
index 7a372cc..c5225c4 100644
--- a/Theme/backend/side.tpl.php
+++ b/Theme/backend/side.tpl.php
@@ -25,12 +25,12 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::SIDE])) : ?>
                     <?php if (isset($parent['nav_icon'])) : ?>
                         <span class="centerText" style="width: 20px; display: inline-block;"><i class="<?= $parent['nav_icon']; ?>"></i></span>
                     <?php endif; ?>
-                    <?= $this->l11n->lang['Navigation'][$parent['nav_name']]; ?><label for="nav-<?= $parent['nav_name']; ?>"><i class="fa fa-chevron-down min"></i>
+                    <?= $this->l11n->getText('Navigation', $parent['nav_name']); ?><label for="nav-<?= $parent['nav_name']; ?>"><i class="fa fa-chevron-down min"></i>
                     <i class="fa fa-chevron-up max"></i></label>
                     <?php foreach ($this->nav[\Modules\Navigation\Models\NavigationType::SIDE][\Modules\Navigation\Models\LinkType::LINK] as $key2 => $link) :
                     if ($link['nav_parent'] === $parent['nav_id']) : ?>
                 <li>
-                    <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->l11n->lang['Navigation'][$link['nav_name']]; ?></a>
+                    <a href="<?= \phpOMS\Uri\UriFactory::build($link['nav_uri']); ?>"><?= $this->l11n->getText('Navigation', $link['nav_name']); ?></a>
                     <?php endif;
                     endforeach; ?>
             </ul>
diff --git a/Theme/backend/top.tpl.php b/Theme/backend/top.tpl.php
index ec2d726..f8264df 100644
--- a/Theme/backend/top.tpl.php
+++ b/Theme/backend/top.tpl.php
@@ -27,7 +27,7 @@ if (isset($this->nav[\Modules\Navigation\Models\NavigationType::TOP])): ?>
                     <i class="<?= $link['nav_icon']; ?>"></i>
                 <?php endif; ?>
 
-                <?= $this->l11n->lang['Navigation'][$link['nav_name']]; ?></a>
+                <?= $this->l11n->getText('Navigation', $link['nav_name']); ?></a>
             <?php endforeach;
             endforeach; ?>