X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpgettext.php;h=fa3260cb1a23eabbba418ecd80d6ea4f1d344104;hb=b86b04a81a5c68c1d936bcc6926bf3350a0587aa;hp=335869eda2104ff69a6cd6cbdebab9314ac8038e;hpb=d61a4a67db0ccd428ae5b5e870027d462e44e730;p=friendica.git

diff --git a/include/pgettext.php b/include/pgettext.php
index 335869eda2..fa3260cb1a 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -3,37 +3,36 @@
 /**
  * @brief translation support
  *
- * Get the language setting directly from system variables, bypassing get_config()
+ * Get the language setting directly from system variables, bypassing Config::get()
  * as database may not yet be configured.
  *
  * If possible, we use the value from the browser.
  *
  */
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
-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')) {
+	$lang_list = [];
+	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);
 
-		$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++) {
+			for ($i = 0; $i < count($lang_parse[1]); $i++) {
 				$lang_list[] = strtolower($lang_parse[1][$i]);
-				if ( strlen($lang_parse[1][$i])>3 ) {
+				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 ) ) {
+					if (!in_array(substr($lang_parse[1][$i], 0, $dashpos), $lang_list ) ) {
 						$lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos));
 					}
 				}
@@ -42,9 +41,8 @@ function get_browser_language() {
 	}
 
 	// 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")) {
+	foreach ($lang_list as $lang) {
+		if ($lang === 'en' || (file_exists("view/lang/$lang") && is_dir("view/lang/$lang"))) {
 			$preferred = $lang;
 			break;
 		}
@@ -55,7 +53,7 @@ function get_browser_language() {
 
 	// in case none matches, get the system wide configured language, or fall back to English
 	return Config::get('system', 'language', 'en');
-}}
+}
 
 
 function push_lang($language) {
@@ -63,13 +61,14 @@ function push_lang($language) {
 
 	$a->langsave = $lang;
 
-	if($language === $lang)
+	if ($language === $lang) {
 		return;
+	}
 
-	if(isset($a->strings) && count($a->strings)) {
+	if (isset($a->strings) && count($a->strings)) {
 		$a->stringsave = $a->strings;
 	}
-	$a->strings = array();
+	$a->strings = [];
 	load_translation_table($language);
 	$lang = $language;
 }
@@ -77,91 +76,131 @@ function push_lang($language) {
 function pop_lang() {
 	global $lang, $a;
 
-	if($lang === $a->langsave)
+	if ($lang === $a->langsave) {
 		return;
+	}
 
-	if(isset($a->stringsave))
+	if (isset($a->stringsave)) {
 		$a->strings = $a->stringsave;
-	else
-		$a->strings = array();
+	} else {
+		$a->strings = [];
+	}
 
 	$lang = $a->langsave;
 }
 
-
 // l
 
-if(! function_exists('load_translation_table')) {
 /**
  * load string translation table for alternate language
  *
- * first plugin strings are loaded, then globals
+ * first addon strings are loaded, then globals
  *
  * @param string $lang language code to load
  */
 function load_translation_table($lang) {
 	$a = get_app();
 
-	$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");
-			}
+	$a->strings = [];
+	// load enabled addons strings
+	$addons = dba::select('addon', ['name'], ['installed' => true]);
+	while ($p = dba::fetch($addons)) {
+		$name = $p['name'];
+		if (file_exists("addon/$name/lang/$lang/strings.php")) {
+			include("addon/$name/lang/$lang/strings.php");
 		}
 	}
 
-	if(file_exists("view/lang/$lang/strings.php")) {
+	if (file_exists("view/lang/$lang/strings.php")) {
 		include("view/lang/$lang/strings.php");
 	}
 
-}}
-
-// translate string if translation exists
-
-if(! function_exists('t')) {
-function t($s) {
+}
 
+/**
+ * @brief Return the localized version of the provided string with optional string interpolation
+ *
+ * This function takes a english string as parameter, and if a localized version
+ * exists for the current language, substitutes it before performing an eventual
+ * string interpolation (sprintf) with additional optional arguments.
+ *
+ * Usages:
+ * - t('This is an example')
+ * - t('URL %s returned no result', $url)
+ * - t('Current version: %s, new version: %s', $current_version, $new_version)
+ *
+ * @param string $s
+ * @return string
+ */
+function t($s)
+{
 	$a = get_app();
 
-	if(x($a->strings,$s)) {
+	if (x($a->strings, $s)) {
 		$t = $a->strings[$s];
-		return is_array($t)?$t[0]:$t;
+		$s = is_array($t) ? $t[0] : $t;
 	}
+	if (func_num_args() > 1) {
+		$args = array_slice(func_get_args(), 1);
+		$s = @vsprintf($s, $args);
+	}
+
 	return $s;
-}}
+}
 
-if(! function_exists('tt')){
-function tt($singular, $plural, $count){
+/**
+ * @brief Return the localized version of a singular/plural string with optional string interpolation
+ *
+ * This function takes two english strings as parameters, singular and plural, as
+ * well as a count. If a localized version exists for the current language, they
+ * are used instead. Discrimination between singular and plural is done using the
+ * localized function if any or the default one. Finally, a string interpolation
+ * is performed using the count as parameter.
+ *
+ * Usages:
+ * - tt('Like', 'Likes', $count)
+ * - tt("%s user deleted", "%s users deleted", count($users))
+ *
+ * @global type $lang
+ * @param string $singular
+ * @param string $plural
+ * @param int $count
+ * @return string
+ */
+function tt($singular, $plural, $count)
+{
 	global $lang;
 	$a = get_app();
 
-	if(x($a->strings,$singular)) {
+	if (x($a->strings, $singular)) {
 		$t = $a->strings[$singular];
-		$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;
-	}
-
-	if ($count!=1){
-		return $plural;
+		if (is_array($t)) {
+			$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
+			if (function_exists($plural_function)) {
+				$plural_function = 'string_plural_select_default';
+			}
+			$i = $plural_function($count);
+			$s = $t[$i];
+		} else {
+			$s = $t;
+		}
+	} elseif (string_plural_select_default($count)) {
+		$s = $plural;
 	} else {
-		return $singular;
+		$s = $singular;
 	}
-}}
+
+	$s = @sprintf($s, $count);
+
+	return $s;
+}
 
 // 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);
-}}
+function string_plural_select_default($n)
+{
+	return $n != 1;
+}
 
 
 
@@ -177,7 +216,7 @@ function string_plural_select_default($n) {
  * @return array
  */
 function get_available_languages() {
-	$langs = array();
+	$langs = [];
 	$strings_file_paths = glob('view/lang/*/strings.php');
 
 	if (is_array($strings_file_paths) && count($strings_file_paths)) {
@@ -185,7 +224,7 @@ function get_available_languages() {
 			$strings_file_paths[] = 'view/lang/en/strings.php';
 		}
 		asort($strings_file_paths);
-		foreach($strings_file_paths as $strings_file_path) {
+		foreach ($strings_file_paths as $strings_file_path) {
 			$path_array = explode('/', $strings_file_path);
 			$langs[$path_array[2]] = $path_array[2];
 		}