From 058493124bd243051cac57d2e3fcd3dea8b375f0 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 8 Nov 2016 08:00:02 +0100 Subject: [PATCH] Locale hotfix --- debian/changelog | 2 +- js/vn/locale.js | 2 +- web/html-service.php | 4 ++-- web/service.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index f84f77b4..b4b373d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.385-deb8) stable; urgency=low +hedera-web (1.387-deb8) stable; urgency=low * Initial Release. diff --git a/js/vn/locale.js b/js/vn/locale.js index 5b60c169..e1fdde23 100644 --- a/js/vn/locale.js +++ b/js/vn/locale.js @@ -32,7 +32,7 @@ module.exports = ,loadScript: function (path, callback) { this.init (); - Vn.includeJs ('locale/'+ this.language +'/'+ path, callback); + Vn.includeJs (path +'/locale/'+ this.language, callback); } ,loadDone: function (request, callback) diff --git a/web/html-service.php b/web/html-service.php index a85820e8..0f3f5a10 100644 --- a/web/html-service.php +++ b/web/html-service.php @@ -103,10 +103,10 @@ class HtmlService extends Service function getUrl ($fileName) { - if (file_exists ($fileName)) +/* if (file_exists ($fileName)) $mTime = '?'. strftime ('%G%m%d%H%M%S', filemtime ($fileName)); else - $mTime = '?'. $this->getVersion (); +*/ $mTime = '?'. $this->getVersion (); return $fileName.$mTime; } diff --git a/web/service.php b/web/service.php index 985d4101..00ba6c6d 100755 --- a/web/service.php +++ b/web/service.php @@ -65,7 +65,7 @@ abstract class Service preg_match_all ($regexp, $_SERVER['HTTP_ACCEPT_LANGUAGE'], $languages); foreach ($languages[1] as $lang) - if (stream_resolve_include_path ("locale/$lang")) + if (TRUE || stream_resolve_include_path ("locale/$lang")) { $_SESSION['lang'] = $lang; break; @@ -74,7 +74,7 @@ abstract class Service if (!isset ($_SESSION['lang'])) $_SESSION['lang'] = NULL; - + Locale::set ($_SESSION['lang']); Locale::addPath ('vn/web');