X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/1b3f5f78060419160ba8e1ec6fa8f1e6399af711..ad89dda4fdde5dd9be57cfe0f1f7ec609acf02b6:/WEB-INF/lib/I18n.class.php

diff --git a/WEB-INF/lib/I18n.class.php b/WEB-INF/lib/I18n.class.php
index b69cd4fb..fd158f58 100644
--- a/WEB-INF/lib/I18n.class.php
+++ b/WEB-INF/lib/I18n.class.php
@@ -54,7 +54,7 @@ class I18n {
 
   // TODO: refactoring ongoing down from here...
     function getWeekDayName($id) {
-      $id = intval($id);
+      $id = (int) $id;
       return $this->weekdayNames[$id];
     }
 
@@ -134,13 +134,18 @@ 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]; // Return full language designation, such as pt-BR.
+      $lang = $lang_pref_parts[0];
+      if ($this->hasLang($lang)) {
+        return $lang; // Return full language designation (if available), such as pt-BR.
       }
-      $lang_parts = explode('-', trim($lang_pref_parts[0]));
+
+      if (strlen($lang) <= 2)
+        continue; // Do not bother determining main language because we already have it.
+
+      $lang_parts = explode('-', trim($lang));
       $lang_main = $lang_parts[0];
-      if ($this->hasLang($lang_main)) {
-        return $lang_main;          // Return main language designation, such as pt.
+      if ($lang_main != $lang && $this->hasLang($lang_main)) {
+        return $lang_main; // Return main language designation, such as pt.
       }
     }
     return false;