From b29de9ab48686ae878de7a9c487ad86ab76b6867 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/monitoring-dashboard.tpl.php   | 40 ++++++++++----------
 Theme/Backend/monitoring-logs-single.tpl.php | 26 ++++++-------
 Theme/Backend/monitoring-logs.tpl.php        | 10 ++---
 Theme/backend/monitoring-logs.tpl.php        | 10 ++---
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php
index dd7699a..f9c6bd1 100644
--- a/Theme/Backend/monitoring-dashboard.tpl.php
+++ b/Theme/Backend/monitoring-dashboard.tpl.php
@@ -19,42 +19,42 @@ $penetrators = $this->app->logger->getHighestPerpetrator();
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Monitoring']['System'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Monitoring', 'System') ?></h1></header>
     <div class="inner">
         <table class="list wf-100">
             <tbody>
-                <tr><td><?= $this->l11n->lang['Monitoring']['OS'] ?><td><?= php_uname('s'); ?>
-                <tr><td><?= $this->l11n->lang['Monitoring']['Version'] ?><td><?= php_uname('v'); ?>
-                <tr><td><?= $this->l11n->lang['Monitoring']['Release'] ?><td><?= php_uname('r'); ?>
-                <tr><td><?= $this->l11n->lang['Monitoring']['RAMUsage'] ?><td><?= memory_get_usage(true)/(1024*1024); ?> MB
-                <tr><td><?= $this->l11n->lang['Monitoring']['MemoryLimit'] ?><td><?= ini_get('memory_limit'); ?>
-                <tr><td><?= $this->l11n->lang['Monitoring']['SystemRAM'] ?><td><?= \phpOMS\System\SystemUtils::getRAM()/(1024); ?> MB
-                <tr><td><?= $this->l11n->lang['Monitoring']['CPUUsage'] ?><td><?= \phpOMS\System\SystemUtils::getCpuUsage(); ?>%
-                <tr><td><?= $this->l11n->lang['Monitoring']['DiskUsage'] ?><td><?= round(\phpOMS\System\File\Directory::getFolderSize(ROOT_PATH)/1000000, true); ?> MB
+                <tr><td><?= $this->l11n->getText('Monitoring', 'OS') ?><td><?= php_uname('s'); ?>
+                <tr><td><?= $this->l11n->getText('Monitoring', 'Version') ?><td><?= php_uname('v'); ?>
+                <tr><td><?= $this->l11n->getText('Monitoring', 'Release') ?><td><?= php_uname('r'); ?>
+                <tr><td><?= $this->l11n->getText('Monitoring', 'RAMUsage') ?><td><?= memory_get_usage(true)/(1024*1024); ?> MB
+                <tr><td><?= $this->l11n->getText('Monitoring', 'MemoryLimit') ?><td><?= ini_get('memory_limit'); ?>
+                <tr><td><?= $this->l11n->getText('Monitoring', 'SystemRAM') ?><td><?= \phpOMS\System\SystemUtils::getRAM()/(1024); ?> MB
+                <tr><td><?= $this->l11n->getText('Monitoring', 'CPUUsage') ?><td><?= \phpOMS\System\SystemUtils::getCpuUsage(); ?>%
+                <tr><td><?= $this->l11n->getText('Monitoring', 'DiskUsage') ?><td><?= round(\phpOMS\System\File\Directory::getFolderSize(ROOT_PATH)/1000000, true); ?> MB
         </table>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Monitoring']['Logs'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Monitoring', 'Logs') ?></h1></header>
     <div class="inner">
         <table class="list wf-100">
             <tbody>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Emergencies'] ?><td><?= $logs['emergency'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Criticals'] ?><td><?= $logs['critical'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Errors'] ?><td><?= $logs['error'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Warnings'] ?><td><?= $logs['warning'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Alerts'] ?><td><?= $logs['alert'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Notices'] ?><td><?= $logs['notice'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Info'] ?><td><?= $logs['info'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Debug'] ?><td><?= $logs['debug'] ?? 0; ?>
-            <tr><td><?= $this->l11n->lang['Monitoring']['Total'] ?><td><?= array_sum($logs); ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Emergencies'] ?><td><?= $logs['emergency') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Criticals'] ?><td><?= $logs['critical') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Errors'] ?><td><?= $logs['error') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Warnings'] ?><td><?= $logs['warning') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Alerts'] ?><td><?= $logs['alert') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Notices'] ?><td><?= $logs['notice') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Info'] ?><td><?= $logs['info') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Debug'] ?><td><?= $logs['debug') ?? 0; ?>
+            <tr><td><?= $this->l11n->getText('Monitoring', 'Total') ?><td><?= array_sum($logs); ?>
         </table>
     </div>
 </section>
 
 <section class="box w-33 floatLeft">
-    <header><h1><?= $this->l11n->lang['Monitoring']['Penetrators'] ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Monitoring', 'Penetrators') ?></h1></header>
     <div class="inner">
         <table class="list wf-100">
             <tbody>
diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php
index 3bbf1c7..b0525ea 100644
--- a/Theme/Backend/monitoring-logs-single.tpl.php
+++ b/Theme/Backend/monitoring-logs-single.tpl.php
@@ -33,59 +33,59 @@ $details = '* Uri: `' . trim($log['path']) . "`\n"
 echo $this->getData('nav')->render(); ?>
 
 <section class="box w-100">
-    <header><h1><?= $this->l11n->lang['Monitoring']['Logs']; ?></h1></header>
+    <header><h1><?= $this->l11n->getText('Monitoring', 'Logs'); ?></h1></header>
 
     <div class="inner">
         <table class="list w-100">
             <tr>
-                <td><?= $this->l11n->lang[0]['ID']; ?>
+                <td><?= $this->l11n->getText(0, 'ID'); ?>
                 <td><i class="fa fa-anchor"></i>
                 <td class="wf-100"><?= (int) $this->request->getData('id') ?? 0; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Time']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Time'); ?>
                 <td><i class="fa fa-clock-o"></i>
                 <td><?= $log['datetime']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Uri']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Uri'); ?>
                 <td><i class="fa fa-globe"></i>
                 <td><?= $log['path']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Source']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Source'); ?>
                 <td><i class="fa fa-wifi"></i>
                 <td><?= $log['ip']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Level']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Level'); ?>
                 <td>
                     <i class="fa fa-<?= in_array($log['level'], ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'; ?>"></i>
                 <td><?= $log['level']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Message']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Message'); ?>
                 <td><i class="fa fa-commenting"></i>
                 <td><?= $log['message']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['File']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'File'); ?>
                 <td><i class="fa fa-file"></i>
                 <td><?= $log['file']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Line']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Line'); ?>
                 <td><i class="fa fa-commenting"></i>
                 <td><?= $log['line']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['Version']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'Version'); ?>
                 <td><i class="fa fa-pencil"></i>
                 <td><?= $log['version']; ?>
             <tr>
-                <td><?= $this->l11n->lang['Monitoring']['OS']; ?>
+                <td><?= $this->l11n->getText('Monitoring', 'OS'); ?>
                 <td><i class="fa fa-laptop"></i>
                 <td><?= $log['os']; ?>
             <tr>
-                <td colspan="3"><?= $this->l11n->lang['Monitoring']['Backtrace']; ?>
+                <td colspan="3"><?= $this->l11n->getText('Monitoring', 'Backtrace'); ?>
             <tr>
                 <td colspan="3">
                     <pre><?= json_encode($log['backtrace'], JSON_PRETTY_PRINT); ?></pre>
             <tr>
                 <td colspan="3" style="padding-top: 10px"><a class="button" target="_blank"
-                       href="https://gitreports.com/issue/Orange-Management/Orange-Management/?name=Guest&issue_title=<?= urlencode($log['message']); ?>&details=<?= urlencode($details); ?>"><?= $this->l11n->lang['Monitoring']['Report']; ?></a>
+                       href="https://gitreports.com/issue/Orange-Management/Orange-Management/?name=Guest&issue_title=<?= urlencode($log['message']); ?>&details=<?= urlencode($details); ?>"><?= $this->l11n->getText('Monitoring', 'Report'); ?></a>
         </table>
     </div>
 </section>
diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php
index 16a65fe..a685700 100644
--- a/Theme/Backend/monitoring-logs.tpl.php
+++ b/Theme/Backend/monitoring-logs.tpl.php
@@ -30,13 +30,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Monitoring']['Logs']; ?></caption>
+        <caption><?= $this->l11n->getText('Monitoring', 'Logs'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang['Monitoring']['Timestamp']; ?>
-            <td><?= $this->l11n->lang['Monitoring']['Level']; ?>
-            <td><?= $this->l11n->lang['Monitoring']['Source']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Monitoring']['Message']; ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Timestamp'); ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Level'); ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Source'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Monitoring', 'Message'); ?>
                 <tfoot>
         <tr>
             <td colspan="5"><?= $footerView->render(); ?>
diff --git a/Theme/backend/monitoring-logs.tpl.php b/Theme/backend/monitoring-logs.tpl.php
index 16a65fe..a685700 100644
--- a/Theme/backend/monitoring-logs.tpl.php
+++ b/Theme/backend/monitoring-logs.tpl.php
@@ -30,13 +30,13 @@ echo $this->getData('nav')->render(); ?>
 
 <div class="box w-100">
     <table class="table">
-        <caption><?= $this->l11n->lang['Monitoring']['Logs']; ?></caption>
+        <caption><?= $this->l11n->getText('Monitoring', 'Logs'); ?></caption>
         <thead>
         <tr>
-            <td><?= $this->l11n->lang['Monitoring']['Timestamp']; ?>
-            <td><?= $this->l11n->lang['Monitoring']['Level']; ?>
-            <td><?= $this->l11n->lang['Monitoring']['Source']; ?>
-            <td class="wf-100"><?= $this->l11n->lang['Monitoring']['Message']; ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Timestamp'); ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Level'); ?>
+            <td><?= $this->l11n->getText('Monitoring', 'Source'); ?>
+            <td class="wf-100"><?= $this->l11n->getText('Monitoring', 'Message'); ?>
                 <tfoot>
         <tr>
             <td colspan="5"><?= $footerView->render(); ?>