From b2f5d439d5ea6ef7a5c91ccd757e5bbf4925a9a2 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@e-graphics.com>
Date: Fri, 31 Aug 2018 14:05:18 +0900
Subject: [PATCH] Set paths update for correct check for classes + lang reload

---
 4dev/database/data/edit_tables.sql |  2 --
 www/admin/set_paths.inc            | 29 ++++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/4dev/database/data/edit_tables.sql b/4dev/database/data/edit_tables.sql
index 7c63a036..483d7617 100755
--- a/4dev/database/data/edit_tables.sql
+++ b/4dev/database/data/edit_tables.sql
@@ -65,7 +65,6 @@ INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Default Scheme',
 INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Admin', 'CC7E7E', 1);
 INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Visitor', 'B0C4B3', 1);
 INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('User', '1E789E', 1);
-INSERT INTO edit_scheme (name, header_color, enabled) VALUES ('Client', '479e61', 1);
 
 -- edit language
 DELETE FROM edit_language;
@@ -75,7 +74,6 @@ INSERT INTO edit_language (short_name, long_name, iso_name, order_number, enable
 -- edit group
 DELETE FROM edit_group;
 INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Admin', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Admin'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'admin'));
-INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('Client', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'Client'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'del'));
 INSERT INTO edit_group (name, enabled, edit_scheme_id, edit_access_right_id) VALUES ('User', 1, (SELECT edit_scheme_id FROM edit_scheme WHERE name = 'User'), (SELECT edit_access_right_id FROM edit_access_right WHERE type = 'write'));
 
 -- edit page access
diff --git a/www/admin/set_paths.inc b/www/admin/set_paths.inc
index c15f521c..1e12cb4f 100644
--- a/www/admin/set_paths.inc
+++ b/www/admin/set_paths.inc
@@ -111,7 +111,34 @@ if (!is_dir($cms->cache_pictures)) {
 if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) || strcasecmp(DEFAULT_LANG, $lang)) {
 	$cms->debug('LANG', 'Orig: '.LAYOUT.DEFAULT_TEMPLATE.LANG.', New: '.$cms->lang_dir.' | Orig Lang: '.DEFAULT_LANG.', New Lang: '.$lang);
 	$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
-	$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
+		// if we have login class
+	if ($login) {
+		$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
+	}
+	// if we have smarty template class
+	if ($smarty) {
+		$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
+	}
+}
+
+// javascrip translate data as template for auto translate
+if (!$TEMPLATE_TRANSLATE) {
+	$cms->debug('LANG', 'Load lang: '.$lang.', for page file jsTranslate_'.$lang.'.tpl');
+	$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
+} else {
+	// we assume we have some fixed set
+	// we must add _<$lang>
+	// if .tpl, put before .tpl
+	// if not .tpl, add _<$lang>.tpl
+	if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
+		$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
+	} else {
+		$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
+	}
+}
+// if we can't find it, dump it
+if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
+	unset($TEMPLATE_TRANSLATE);
 }
 
 //	$cms->debug("LANGUAGE", "L: $lang | ".$cms->lang_dir." | MO File: ".$cms->l->mofile);