X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpgettext.php;h=23430fc77dc272b65274542d239debf0c4e5ca06;hb=57db109474fcdb9e2b2a9173e6a3397e20f2ca7a;hp=a079a468789909c9cebc6c5cfb2150c743986eb9;hpb=04af5d9e2cc7a05c6ea0312643ddc4e8b45846bf;p=friendica.git

diff --git a/include/pgettext.php b/include/pgettext.php
index a079a46878..23430fc77d 100644
--- 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);
@@ -85,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;
 
+	// 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");
+			}
+		}
+	}
+	
+	$a->strings = array();
 	if(file_exists("view/$lang/strings.php")) {
 		include("view/$lang/strings.php");
 	}
-	else
-		$a->strings = array();
+
 }}
 
 // translate string if translation exists