Bugfix for pull request #2147 (Fix for issue #2122)

[friendica.git] / include / pgettext.php

diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d60b9b1c0d05254a53b3647fb64090bc..f72cbb08a71c707151434380cf9e4c886bb365a1 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("include/dba.php");
+
 /**
  * translation support
  */
@@ -9,32 +11,32 @@
  *
  * Get the language setting directly from system variables, bypassing get_config()
  * as database may not yet be configured.
- * 
+ *
  * If possible, we use the value from the browser.
  *
  */
 
 
-if(! function_exists('get_language')) {
-function get_language() {
+if(! function_exists('get_browser_language')) {
+function get_browser_language() {
 
-       if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-           // break up string into pieces (languages and q factors)
-       preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', 
+       if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
+               // break up string into pieces (languages and q factors)
+               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);
 
-       if (count($lang_parse[1])) {
-               // 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;
-               }
-
-               // sort list based on value     
-               arsort($langs, SORT_NUMERIC);
-       }
+               if (count($lang_parse[1])) {
+                       // 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;
+                       }
+
+                       // sort list based on value
+                       arsort($langs, SORT_NUMERIC);
+               }
        }
 
        if(isset($langs) && count($langs)) {
@@ -49,6 +51,7 @@ function get_language() {
        if(isset($preferred))
                return $preferred;
 
+    $a = get_app();
        return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
 
@@ -84,17 +87,35 @@ function pop_lang() {
 }
 
 
-// load string translation table for alternate language
+// l
 
 if(! function_exists('load_translation_table')) {
+/**
+ * load string translation table for alternate language
+ *
+ * first plugin strings are loaded, then globals
+ *
+ * @param string $lang language code to load
+ */
 function load_translation_table($lang) {
        global $a;
 
+       $a->strings = array();
+       // load enabled plugins strings
+       $plugins = q("SELECT name FROM addon WHERE installed=1;");
+       if ($plugins!==false) {
+               foreach($plugins as $p) {
+                       $name = $p['name'];
+                       if(file_exists("addon/$name/lang/$lang/strings.php")) {
+                               include("addon/$name/lang/$lang/strings.php");
+                       }
+               }
+       }
+
        if(file_exists("view/$lang/strings.php")) {
                include("view/$lang/strings.php");
        }
-       else
-               $a->strings = array();
+
 }}
 
 // translate string if translation exists
@@ -124,7 +145,7 @@ function tt($singular, $plural, $count){
                $k = $f($count);
                return is_array($t)?$t[$k]:$t;
        }
-       
+
        if ($count!=1){
                return $plural;
        } else {
@@ -132,11 +153,34 @@ function tt($singular, $plural, $count){
        }
 }}
 
-// provide a fallback which will not collide with 
-// a function defined in any language file 
+// provide a fallback which will not collide with
+// a function defined in any language file
 
 if(! function_exists('string_plural_select_default')) {
 function string_plural_select_default($n) {
        return ($n != 1);
 }}
 
+
+/**
+ * Return installed languages as associative array
+ * [
+ *             lang => lang,
+ *             ...
+ * ]
+ */
+function get_avaiable_languages() {
+       $lang_choices = array();
+       $langs = glob('view/*/strings.php'); /**/
+
+       if(is_array($langs) && count($langs)) {
+               if(! in_array('view/en/strings.php',$langs))
+                       $langs[] = 'view/en/';
+               asort($langs);
+               foreach($langs as $l) {
+                       $t = explode("/",$l);
+                       $lang_choices[$t[1]] = $t[1];
+               }
+       }
+       return $lang_choices;
+}