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 f21c0a01b56dce67feb75d7e1a8a299b14d190c8..0683f91f10d8e5d47444c97627c67217a1860871 100644 (file)
--- 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));
     $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)) {
       $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 481d623ddf066b17c35fe371f03fb2212bb375cb..dce50ae2639ace200a094ea1cb8ffd09c09df0d7 100644 (file)
--- 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',
 // 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',
 'menu.profile' => 'Perfil',
 'menu.time' => 'Tempo',
 'menu.expenses' => 'Gastos',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 70b02fead589d9e7d7a6e31b93d1b172e34c4a41..66a4d772a4b5cf21f867db7d088aae422f90d31b 100644 (file)
--- 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>
       <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>
             <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>