Merge pull request #2016 from fabrixxm/template_vars_hook

[friendica.git] / include / pgettext.php

diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d60b9b1c0d05254a53b3647fb64090bc..4f8db43d471b12ea828004d433194fcba90e99a5 100644 (file)
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once("include/dba.php");
+
 /**
  * translation support
  */
@@ -15,10 +17,10 @@
  */
 
 
-if(! function_exists('get_language')) {
-function get_language() {
+if(! function_exists('get_browser_language')) {
+function get_browser_language() {
 
-       if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+       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);
@@ -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