X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpgettext.php;h=4f8db43d471b12ea828004d433194fcba90e99a5;hb=57ebb00a1fa6ea54d2aebda5c443841e0c5e6590;hp=47242f7ba981289afc102acff5a7aeff5b90e43a;hpb=040fc247a0caa51e0d4da4169980dc32e80ee804;p=friendica.git

diff --git a/include/pgettext.php b/include/pgettext.php
index 47242f7ba9..4f8db43d47 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);
@@ -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');
 }}
 
@@ -58,6 +61,9 @@ function push_lang($language) {
 
 	$a->langsave = $lang;
 
+	if($language === $lang)
+		return;
+
 	if(isset($a->strings) && count($a->strings)) {
 		$a->stringsave = $a->strings;
 	}
@@ -68,6 +74,10 @@ function push_lang($language) {
 
 function pop_lang() {
 	global $lang, $a;
+
+	if($lang === $a->langsave)
+		return;
+
 	if(isset($a->stringsave))
 		$a->strings = $a->stringsave;
 	else
@@ -77,14 +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;
 
-	if(file_exists("view/$lang/strings.php"))
+	$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");
+	}
+
 }}
 
 // translate string if translation exists
@@ -103,12 +134,15 @@ function t($s) {
 
 if(! function_exists('tt')){
 function tt($singular, $plural, $count){
-	
+	global $lang;
 	$a = get_app();
 
 	if(x($a->strings,$singular)) {
 		$t = $a->strings[$singular];
-		$k = string_plural_select($count);
+		$f = 'string_plural_select_' . str_replace('-','_',$lang);
+		if(! function_exists($f))
+			$f = 'string_plural_select_default';
+		$k = $f($count);
 		return is_array($t)?$t[$k]:$t;
 	}
 	
@@ -117,4 +151,13 @@ function tt($singular, $plural, $count){
 	} else {
 		return $singular;
 	}
-}}
\ No newline at end of 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);
+}}
+