From 407d1fa8a92697329a6d4c4ab8f0beef3f5e595f Mon Sep 17 00:00:00 2001 From: JonatanRek Date: Fri, 11 Oct 2019 14:12:05 +0200 Subject: [PATCH] Big LNG MNG update for revox --- app/class/LangManager.php | 28 +++++++++-- app/lang/cs.php | 3 +- app/lang/en.php | 31 +++++++++++- app/lang/pl.php | 2 +- app/templates/automation.phtml | 12 ++--- app/templates/dashboard.phtml | 12 ++--- app/templates/home.phtml | 9 ++-- app/templates/log.phtml | 5 +- app/templates/part/automationButton.phtml | 4 +- app/templates/part/automationCreate.phtml | 42 ++++++++-------- .../part/automationCreateFinal.phtml | 4 +- app/templates/part/automationEdit.phtml | 44 ++++++++--------- app/templates/part/deviceDetail.phtml | 16 +++---- app/templates/part/deviceEdit.phtml | 48 +++++++++---------- app/templates/part/menu.phtml | 2 +- app/templates/part/sceneCreate.phtml | 10 ++-- app/templates/scene.phtml | 12 ++--- app/templates/setting.phtml | 22 +++++---- app/views/Automation.php | 4 +- app/views/Dashboard.php | 4 +- app/views/Home.php | 4 +- app/views/Log.php | 4 +- app/views/Scene.php | 4 +- app/views/Setting.php | 4 +- index.php | 24 +++++----- 25 files changed, 202 insertions(+), 152 deletions(-) diff --git a/app/class/LangManager.php b/app/class/LangManager.php index 6a218ec..b85b97f 100644 --- a/app/class/LangManager.php +++ b/app/class/LangManager.php @@ -7,24 +7,36 @@ class LanguageManager private $lngCode = 'en'; private $lngDatabase = []; + private $debug = false; - function __construct(string $lngCode) + function __construct(string $lngCode, bool $debug = false) { $this->lngCode = $lngCode; + $this->debug = $debug; } function load() { $file = './app/lang/en.php'; + if (!file_exists($file)){ + die(); + //TODO add lng EXEPTIONS + } $arrayFirst = include($file); $file = './app/lang/' . $this->lngCode . '.php'; - $arraySecond = include($file); + $arraySecond = []; + if (file_exists($file)){ + $arraySecond = include($file); + } $this->lngDatabase = array_merge($arrayFirst,$arraySecond); return true; } function get(string $stringKey) { + if ($this->debug) { + return $stringKey; + } if (isset($this->lngDatabase[$stringKey])) { return $this->lngDatabase[$stringKey]; } @@ -33,9 +45,15 @@ class LanguageManager function echo(string $stringKey) { - if (isset($this->lngDatabase[$stringKey])) { - return $this->lngDatabase[$stringKey]; + if ($this->debug) { + echo $stringKey; + return; } - return $stringKey; + if (isset($this->lngDatabase[$stringKey])) { + echo $this->lngDatabase[$stringKey]; + return; + } + echo $stringKey; + return; } } diff --git a/app/lang/cs.php b/app/lang/cs.php index 92f5501..ae31830 100644 --- a/app/lang/cs.php +++ b/app/lang/cs.php @@ -1,5 +1,5 @@ 'Domů', 'm_dashboard' => 'Nástěnka', @@ -45,6 +45,7 @@ $lang = [ 'l_sleepTime' => 'Doba spánku zařízení', 'l_atHome' => 'Doma Jsou', 'l_nameAt' => 'Název', + 'l_lastSeen' => 'Naposledy připojeno', //Title 't_createScene' => 'Vytvořit scénu', diff --git a/app/lang/en.php b/app/lang/en.php index c29271f..ee6a736 100644 --- a/app/lang/en.php +++ b/app/lang/en.php @@ -1,5 +1,5 @@ 'Home', 'm_dashboard' => 'Dashboard', @@ -21,6 +21,12 @@ $lang = [ 'b_approve' => 'Approve', 'b_disable' => 'Disable', 'b_save' => 'Save', + 'b_logOut' => 'Logout', + 'b_sendTestNotification' => 'Send Test Notification', + 'b_rooms' => 'Rooms', + 'b_restart' => 'Restart', + 'b_disable' => 'disabele', + 'b_select' => 'Select', //labels @@ -45,6 +51,8 @@ $lang = [ 'l_sleepTime' => 'Device sleep Time', 'l_atHome' => 'At home', 'l_nameAt' => 'Name', + 'l_lastSeen' => 'Last Seen', + 'l_notificationStatus' => 'Notification status', //Title 't_createScene' => 'Create Scene', @@ -52,7 +60,15 @@ $lang = [ 't_createAutomation' => 'Create Automation', + + 't_addDevice' => 'Add Device', 't_editDevice' => 'Edit Device', + 't_pageAfterLogIn' => 'Page After Login', + 't_profile' => 'Profile', + 't_notification' => 'Notification', + 't_experimental' => 'Experimental', + 't_' => 'Edit Device', + //constants 'humi' => 'Humidity', @@ -73,6 +89,19 @@ $lang = [ 'w_neni' => 'At', 'w_is' => 'is', + //tables + 't_time' => 'Time', + 't_state' => 'State', + + //Days Long + 'd_monday' => 'Monday', + 'd_tuesday' => 'Tuesday', + 'd_wednesday' => 'Wednesday', + 'd_thursday' => 'Thursday', + 'd_friday' => 'Friday', + 'd_saturday' => 'Saturday', + 'd_sunday' => 'Sunday', + //example '' => '', ]; diff --git a/app/lang/pl.php b/app/lang/pl.php index 6759ada..9daf095 100644 --- a/app/lang/pl.php +++ b/app/lang/pl.php @@ -1,5 +1,5 @@ 'Home', 'm_dashboard' => 'Dashboard', diff --git a/app/templates/automation.phtml b/app/templates/automation.phtml index 4d1b50a..ee6c5eb 100644 --- a/app/templates/automation.phtml +++ b/app/templates/automation.phtml @@ -14,24 +14,24 @@ prepare('item','automation'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?>
- + echo('t_createAutomation'); ?>
$automationData) { //BUTTON $partial = new Partial('automationButton'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('automationId',$automationId); $partial->prepare('automationData',$automationData); $partial->render(); //EDIT $partial = new Partial('automationEdit'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('automationId',$automationId); $partial->prepare('automation',$automationData); $partial->prepare('subDevices',$SUBDEVICES); @@ -43,12 +43,12 @@ prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('subDevices',$SUBDEVICES); $partial->render(); } else { $partial = new Partial('automationCreate'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('subDevices',$SUBDEVICES); $partial->render(); } diff --git a/app/templates/dashboard.phtml b/app/templates/dashboard.phtml index e64a691..bab489c 100644 --- a/app/templates/dashboard.phtml +++ b/app/templates/dashboard.phtml @@ -14,12 +14,12 @@ prepare('item', 'dashboard'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?>
- Add Device + echo('t_addDevice'); ?>
$dashboardItemData) { $partialDeviceButton = new Partial('dashboardButton'); @@ -36,17 +36,17 @@
-

Modal bitch

+

echo('t_addDevice'); ?>

-
Zvolte zařízení:
- $subDeviceValue){ ?>
- +
diff --git a/app/templates/home.phtml b/app/templates/home.phtml index baf3a5c..fe0eade 100644 --- a/app/templates/home.phtml +++ b/app/templates/home.phtml @@ -14,7 +14,7 @@ prepare('item', 'home'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?>
@@ -25,7 +25,8 @@
echo('l_atHome'); + echo ': ' . $USERSATHOME; } ?>
@@ -58,7 +59,7 @@ $partialDetail->prepare('subdeviceid',$subDeviceKey); $partialDetail->prepare('subdevice',$subDevice); $partialDetail->prepare('device',$device); - $partialDetail->prepare('lang',$LANG); + $partialDetail->prepare('langMng',$LANGMNG); $partialDetail->render(); @@ -69,7 +70,7 @@ $partialEdit->prepare('device',$device); $partialEdit->prepare('users',$USERS); $partialEdit->prepare('rooms',$ROOMS); - $partialEdit->prepare('lang',$LANG); + $partialEdit->prepare('langMng',$LANGMNG); $partialEdit->render(); } diff --git a/app/templates/log.phtml b/app/templates/log.phtml index cf3ba59..8bae295 100644 --- a/app/templates/log.phtml +++ b/app/templates/log.phtml @@ -14,7 +14,7 @@ prepare('item', 'log'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?> @@ -22,13 +22,12 @@
-
LOG:CZ
- +
- restart + echo('b_restart')?>
- deaktivovat + echo('b_disable')?>
diff --git a/app/templates/part/automationCreate.phtml b/app/templates/part/automationCreate.phtml index 57f871a..b8a1035 100644 --- a/app/templates/part/automationCreate.phtml +++ b/app/templates/part/automationCreate.phtml @@ -1,24 +1,24 @@ diff --git a/app/templates/part/automationCreateFinal.phtml b/app/templates/part/automationCreateFinal.phtml index 7d372f9..e03425f 100644 --- a/app/templates/part/automationCreateFinal.phtml +++ b/app/templates/part/automationCreateFinal.phtml @@ -1,7 +1,7 @@ diff --git a/app/templates/part/automationEdit.phtml b/app/templates/part/automationEdit.phtml index 999486e..640f2ca 100644 --- a/app/templates/part/automationEdit.phtml +++ b/app/templates/part/automationEdit.phtml @@ -3,26 +3,26 @@
-

+

echo('t_createAutomation');?>

-
+
echo('l_nameAt');?>
" required/>
-
+
echo('l_runAt');?>
" /> />
-
+
echo('l_affectedDevices'); ?>
-
+
echo('l_atDays');?>
- /> Pondělí + /> echo('d_monday'); ?>
- /> Úterý + /> echo('d_tuesday'); ?>
- /> Středa + /> echo('d_wednesday'); ?>
- /> Čtvrtek + /> echo('d_thursday'); ?>
- /> Pátek + /> echo('d_friday'); ?>
- /> Sobota + /> echo('d_saturday'); ?>
- /> Neděle + /> echo('d_sunday'); ?>
- - + +
diff --git a/app/templates/part/deviceDetail.phtml b/app/templates/part/deviceDetail.phtml index e5ed9b0..7197648 100644 --- a/app/templates/part/deviceDetail.phtml +++ b/app/templates/part/deviceDetail.phtml @@ -6,7 +6,7 @@

-

Last Seen

+

echo('l_lastSeen'); echo ' ' . $SUBDEVICE['lastRecort']['niceTime']; ?>

@@ -18,7 +18,7 @@ data-period="year" data-group="month" data-sub-device-id="" - value="" + value="echo('b_year');?>" />
- - + + diff --git a/app/templates/part/deviceEdit.phtml b/app/templates/part/deviceEdit.phtml index 69975f6..062d7a3 100644 --- a/app/templates/part/deviceEdit.phtml +++ b/app/templates/part/deviceEdit.phtml @@ -3,15 +3,15 @@
-

+

echo('t_editDevice'); ?>

-
+
echo('l_owner'); ?>
-
+
echo('l_permission'); ?>
-
-
+
- echo('l_owner'); ?>
@@ -37,24 +37,24 @@ echo ''; } ?> - /> - /> - /> + />echo('l_read'); ?> + />echo('l_use'); ?> + />echo('l_edit'); ?>
-
-
+
- echo('l_member'); ?>
- /> - /> - /> + />echo('l_read'); ?> + />echo('l_use'); ?> + />echo('l_edit'); ?>
-
+
echo('w_title'); ?>
>
@@ -65,13 +65,13 @@
-
+
echo('l_sleepTime'); ?>
> -

* -

+

* - echo('l_inMinutes'); ?>

-
+
echo('w_room'); ?>
> - + @@ -98,7 +98,7 @@
-
+
echo('w_moduls'); ?>
$subDevice) { ?>
@@ -123,11 +123,11 @@
- /> - + /> +
-
+
echo('w_moduls'); ?>
$subDevice) { ?>
@@ -152,8 +152,8 @@
- - + +
diff --git a/app/templates/part/menu.phtml b/app/templates/part/menu.phtml index b87d80b..4c03072 100644 --- a/app/templates/part/menu.phtml +++ b/app/templates/part/menu.phtml @@ -37,7 +37,7 @@ - + echo('m_'.$value['lngKey']); ?>
diff --git a/app/templates/part/sceneCreate.phtml b/app/templates/part/sceneCreate.phtml index 6d71fde..ba00251 100644 --- a/app/templates/part/sceneCreate.phtml +++ b/app/templates/part/sceneCreate.phtml @@ -3,14 +3,14 @@
-

+

echo('t_createScene');?>

-
:
+
echo('w_title');?>:
-
:
+
echo('w_icon');?>:
-
+
echo('l_choseDevice');?>
- + \ No newline at end of file diff --git a/app/templates/scene.phtml b/app/templates/scene.phtml index 6b3d3b4..9937f3d 100644 --- a/app/templates/scene.phtml +++ b/app/templates/scene.phtml @@ -14,17 +14,17 @@ prepare('item', 'scene'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?>
- + echo('t_createScene');?>
$sceneData) { //BUTTON $partialScenButton = new Partial('sceneButton'); - $partialScenButton->prepare('lang', $LANG); + $partialScenButton->prepare('langMng', $LANGMNG); $partialScenButton->prepare('sceneId', $sceneId); $partialScenButton->prepare('sceneData', $sceneData); @@ -32,7 +32,7 @@ // Edit $partialSceneEdit = new Partial('sceneEdit'); - $partialSceneEdit->prepare('lang',$LANG); + $partialSceneEdit->prepare('langMng',$LANGMNG); $partialSceneEdit->prepare('sceneId',$sceneId); $partialSceneEdit->prepare('scene',$sceneData); @@ -45,7 +45,7 @@ prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('setStateFormDevices',$SETSTATEFORMDEVICES ); $partial->prepare('sceneIcon',$SCENEICON ); $partial->prepare('SceneName',$SCENENAME ); @@ -53,7 +53,7 @@ $partial->render(); } else { $partial = new Partial('sceneCreate'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->prepare('subDevices',$SUBDEVICES); $partial->render(); diff --git a/app/templates/setting.phtml b/app/templates/setting.phtml index ce790d7..01f133c 100644 --- a/app/templates/setting.phtml +++ b/app/templates/setting.phtml @@ -14,13 +14,15 @@ prepare('item', 'setting'); - $partial->prepare('lang',$LANG); + $partial->prepare('langMng',$LANGMNG); $partial->render(); ?>
-

Stránka po načtení

+

+ echo('t_pageAfterLogIn') ?> +

@@ -29,28 +31,28 @@
- +
-

Profil

+

echo('t_profile') ?>

- Odhlásit se + echo('b_logOut') ?>
-

Notifications

+

echo('t_notification') ?>

-
Status notifikací
+
echo('l_notificationStatus') ?>
- Test Notification + echo('b_sendTestNotification');?>
-

Logs

+

echo('t_experimental') ?>

- ROOMS + echo('b_rooms') ?>
diff --git a/app/views/Automation.php b/app/views/Automation.php index 89940d1..33f59bd 100644 --- a/app/views/Automation.php +++ b/app/views/Automation.php @@ -10,7 +10,7 @@ class Automation extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./login'); @@ -52,7 +52,7 @@ class Automation extends Template $template = new Template('automation'); $template->prepare('title', 'Automation'); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $template->prepare('automations', $automations); $template->prepare('subDevices', $approvedSubDevices); diff --git a/app/views/Dashboard.php b/app/views/Dashboard.php index cfa5d20..990c057 100644 --- a/app/views/Dashboard.php +++ b/app/views/Dashboard.php @@ -4,7 +4,7 @@ class Dashboard extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./login'); @@ -81,7 +81,7 @@ class Dashboard extends Template } $template->prepare('title', 'Nástěnka'); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $template->prepare('dashboard', $dashboard); $template->prepare('subDevices', $approvedSubDevices); diff --git a/app/views/Home.php b/app/views/Home.php index debb423..5cbfc91 100644 --- a/app/views/Home.php +++ b/app/views/Home.php @@ -6,7 +6,7 @@ class Home extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./login'); @@ -171,7 +171,7 @@ class Home extends Template $rooms = RoomManager::getAllRooms(); $template->prepare('rooms', $rooms); $template->prepare('title', 'Home'); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $template->prepare('data', $roomsItems); $template->render(); diff --git a/app/views/Log.php b/app/views/Log.php index 8098223..40496a3 100644 --- a/app/views/Log.php +++ b/app/views/Log.php @@ -6,7 +6,7 @@ class Log extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./login'); @@ -26,7 +26,7 @@ class Log extends Template } $template->prepare('logsFiles', $result); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $template->render(); diff --git a/app/views/Scene.php b/app/views/Scene.php index 7608f4f..5ca091c 100644 --- a/app/views/Scene.php +++ b/app/views/Scene.php @@ -4,7 +4,7 @@ class Scene extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./'); @@ -12,7 +12,7 @@ class Scene extends Template $template = new Template('scene'); $template->prepare('title', 'Scény'); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $scenes = []; foreach (SceneManager::getAllScenes() as $sceneId => $sceneData) { diff --git a/app/views/Setting.php b/app/views/Setting.php index a4db0d3..3f8c39a 100644 --- a/app/views/Setting.php +++ b/app/views/Setting.php @@ -4,7 +4,7 @@ class Setting extends Template function __construct() { global $userManager; - global $lang; + global $langMng; if (!$userManager->isLogin()){ header('Location: ./login'); @@ -23,7 +23,7 @@ class Setting extends Template $template = new Template('setting'); $template->prepare('title', 'Automation'); - $template->prepare('lang', $lang); + $template->prepare('langMng', $langMng); $template->prepare('automations', $automations); $template->render(); diff --git a/index.php b/index.php index 3950b6e..5dc8647 100644 --- a/index.php +++ b/index.php @@ -25,21 +25,21 @@ foreach (["class", "views"] as $dir) { /** Language **/ $langTag = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); -$langMng = new LanguageManager($langTag); +$langMng = new LanguageManager($langTag, DEBUGMOD); $langMng->load(); if (DEBUGMOD == 1) { - echo '
'; - echo '
';
-	echo 'Language SLUG: ' . $langTag;
-	echo '
'; - echo '
';
-	print_r(get_defined_constants());
-	echo '
'; - echo '
';
-	print_r(get_defined_vars());
-	echo '
'; - echo ''; + // echo '
'; + // echo '
';
+	// echo 'Language SLUG: ' . $langTag;
+	// echo '
'; + // echo '
';
+	// print_r(get_defined_constants());
+	// echo '
'; + // echo '
';
+	// print_r(get_defined_vars());
+	// echo '
'; + // echo ''; } //DB Conector
TimeStateecho('t_time');?>echo('t_state');?>