From 1b3f5f78060419160ba8e1ec6fa8f1e6399af711 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Tue, 5 Apr 2016 12:58:47 +0000 Subject: [PATCH 1/1] Added clarifying comments. --- WEB-INF/lib/I18n.class.php | 9 +++++---- WEB-INF/resources/ru.lang.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php index 0683f91f..b69cd4fb 100644 --- a/WEB-INF/lib/I18n.class.php +++ b/WEB-INF/lib/I18n.class.php @@ -124,25 +124,26 @@ class I18n { return file_exists($filename); } + // getBrowserLanguage() returns a first supported language from browser settings. function getBrowserLanguage() { $acclang = @$_SERVER['HTTP_ACCEPT_LANGUAGE']; if (empty($acclang)) { - return ""; + return false; } $lang_prefs = explode(',', $acclang); foreach ($lang_prefs as $lang_pref) { $lang_pref_parts = explode(';', trim($lang_pref)); if ($this->hasLang($lang_pref_parts[0])) { - return $lang_pref_parts[0]; + return $lang_pref_parts[0]; // Return full language designation, such as pt-BR. } $lang_parts = explode('-', trim($lang_pref_parts[0])); $lang_main = $lang_parts[0]; if ($this->hasLang($lang_main)) { - return $lang_main; + return $lang_main; // Return main language designation, such as pt. } } - return ""; + return false; } // getLangFileList() returns a list of language files. diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index cef0ba4b..9c99e144 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -40,7 +40,7 @@ $i18n_key_words = array( // Menus - short selection strings that are displayed on the top of application web pages. // Example: https://timetracker.anuko.com (black menu on top). -'menu.login' => 'Войти в систему', +'menu.login' => 'Войти', 'menu.logout' => 'Выйти', 'menu.forum' => 'Форум', 'menu.help' => 'Справка', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 66a4d772..83cb9e25 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.24.3485 | Copyright © Anuko | +  Anuko Time Tracker 1.9.24.3486 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1