From: Nik Okuntseff <support@anuko.com>
Date: Tue, 5 Apr 2016 03:41:05 +0000 (+0000)
Subject: Fixed determination of a multi-part browser language such as pt-br.
X-Git-Tag: timetracker_1.19-1~1732
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=da25ca5669ac88985d37a68392ed736ac03dcc3c;hp=39bd1fe867f6d03562b2ac24b783bd26138b88f7;p=timetracker.git

Fixed determination of a multi-part browser language such as pt-br.
---

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index f21c0a01..0683f91f 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -133,6 +133,9 @@ class I18n {
     $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];
+      }
       $lang_parts = explode('-', trim($lang_pref_parts[0]));
       $lang_main = $lang_parts[0];
       if ($this->hasLang($lang_main)) {
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 481d623d..dce50ae2 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -44,7 +44,7 @@ $i18n_key_words = array(
 // TODO: Translate the following:
 // 'menu.forum' => 'Forum',
 'menu.help' => 'Ajuda',
-'menu.create_team' => 'Criar nova organização', // TODO: is this good? An organization may have multiple teams in TT.
+'menu.create_team' => 'Criar organização', // TODO: is this good? An organization may have multiple teams in TT.
 'menu.profile' => 'Perfil',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 70b02fea..66a4d772 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.23.3484 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.24.3485 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>