rework fallback code

diff --git a/include/pgettext.php b/include/pgettext.php
index ed924fa337209bc51dcfb654bb6ed29bb37e78cf..f1eb75752ce8ed8456e9d8f6e869094a5b80fe25 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,13 +1,7 @@
 <?php
 
-require_once("include/dba.php");
-
-/**
- * translation support
- */
-
-
 /**
+ * @brief translation support
  *
  * Get the language setting directly from system variables, bypassing get_config()
  * as database may not yet be configured.
@@ -16,8 +10,12 @@ require_once("include/dba.php");
  *
  */
 
+require_once("include/dba.php");
 
 if(! function_exists('get_browser_language')) {
+/**
+ * @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
+ */
 function get_browser_language() {
 
        if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
@@ -25,45 +23,34 @@ function get_browser_language() {
                preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
                        $_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
 
+               $lang_list = [];
                if (count($lang_parse[1])) {
+                       // go through the list of prefered languages and add a generic language
+                       // for sub-linguas (e.g. de-ch will add de) if not already in array
                        for ($i=0; $i<count($lang_parse[1]); $i++) {
-                               if ( strlen($lang_parse[1][$i])>2 ) {
-                                       if (! in_array(substr($lang_parse[1][$i], 0, 2), $lang_parse[1] ) ) {
-                                               array_push($lang_parse[1], substr($lang_parse[1][$i], 0, 2));
-                                               if (floatval($lang_parse[4][$i])>0)
-                                                       array_push($lang_parse[4], strval(floatval($lang_parse[4][$i])-0.0001));
-                                               else
-                                                       array_push($lang_parse[4], '0.9999');
+                               $lang_list[] = strtolower($lang_parse[1][$i]);
+                               if ( strlen($lang_parse[1][$i])>3 ) {
+                                       $dashpos = strpos($lang_parse[1][$i], '-');
+                                       if (! in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list ) ) {
+                                               $lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos));
                                        }
                                }
                        }
-                       // create a list like "en" => 0.8
-                       $langs = array_combine($lang_parse[1], $lang_parse[4]);
-
-                       // set default to 1 for any without q factor
-                       foreach ($langs as $lang => $val) {
-                               if ($val === '') $langs[$lang] = 1;
-                               if ($val === '0') $langs[$lang] = 1;
-                       }
-
-                       // sort list based on value
-                       arsort($langs, SORT_NUMERIC);
-                       print_r($langs);
                }
        }
 
-       if(isset($langs) && count($langs)) {
-               foreach ($langs as $lang => $v) {
-                       if(file_exists("view/lang/$lang") && is_dir("view/lang/$lang")) {
-                               $preferred = $lang;
-                               break;
-                       }
+       // check if we have translations for the preferred languages and pick the 1st that has
+       for ($i=0; $i<count($lang_list); $i++) {
+               $lang = $lang_list[$i];
+               if(file_exists("view/lang/$lang") && is_dir("view/lang/$lang")) {
+                       $preferred = $lang;
+                       break;
                }
        }
-
        if(isset($preferred))
                return $preferred;
 
+       // in case none matches, get the system wide configured language, or fall back to English
     $a = get_app();
        return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}