X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpgettext.php;h=fb87798ff72712b74acccc8f2d4a93bf6b5ba1f4;hb=94027f19b4284251141702679e14c08d94e0836c;hp=f72cbb08a71c707151434380cf9e4c886bb365a1;hpb=c0e87b2beac1f326f97eac6e7f97f95e12498405;p=friendica.git

diff --git a/include/pgettext.php b/include/pgettext.php
index f72cbb08a7..fb87798ff7 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -1,13 +1,7 @@
 <?php
 
-require_once("include/dba.php");
-
-/**
- * translation support
- */
-
-
 /**
+ * @brief translation support
  *
  * Get the language setting directly from system variables, bypassing get_config()
  * as database may not yet be configured.
@@ -16,8 +10,12 @@ 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')) {
@@ -25,32 +23,34 @@ function get_browser_language() {
 		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])) {
-			// 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;
+			// 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++) {
+				$lang_list[] = strtolower($lang_parse[1][$i]);
+				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 ) ) {
+						$lang_list[] = strtolower(substr($lang_parse[1][$i], 0, $dashpos));
+					}
+				}
 			}
-
-			// sort list based on value
-			arsort($langs, SORT_NUMERIC);
 		}
 	}
 
-	if(isset($langs) && count($langs)) {
-		foreach ($langs as $lang => $v) {
-			if(file_exists("view/$lang") && is_dir("view/$lang")) {
-				$preferred = $lang;
-				break;
-			}
+	// 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")) {
+			$preferred = $lang;
+			break;
 		}
 	}
-
 	if(isset($preferred))
 		return $preferred;
 
+	// in case none matches, get the system wide configured language, or fall back to English
     $a = get_app();
 	return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
@@ -98,7 +98,7 @@ if(! function_exists('load_translation_table')) {
  * @param string $lang language code to load
  */
 function load_translation_table($lang) {
-	global $a;
+	$a = get_app();
 
 	$a->strings = array();
 	// load enabled plugins strings
@@ -112,8 +112,8 @@ function load_translation_table($lang) {
 		}
 	}
 
-	if(file_exists("view/$lang/strings.php")) {
-		include("view/$lang/strings.php");
+	if(file_exists("view/lang/$lang/strings.php")) {
+		include("view/lang/$lang/strings.php");
 	}
 
 }}
@@ -162,25 +162,31 @@ function string_plural_select_default($n) {
 }}
 
 
+
 /**
- * Return installed languages as associative array
- * [
- * 		lang => lang,
- * 		...
- * ]
+ * @brief Return installed languages codes as associative array
+ *
+ * Scans the view/lang directory for the existence of "strings.php" files, and
+ * returns an alphabetical list of their folder names (@-char language codes).
+ * Adds the english language if it's missing from the list.
+ *
+ * Ex: array('de' => 'de', 'en' => 'en', 'fr' => 'fr', ...)
+ *
+ * @return array
  */
-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];
+function get_available_languages() {
+	$langs = array();
+	$strings_file_paths = glob('view/lang/*/strings.php');
+
+	if (is_array($strings_file_paths) && count($strings_file_paths)) {
+		if (!in_array('view/lang/en/strings.php', $strings_file_paths)) {
+			$strings_file_paths[] = 'view/lang/en/strings.php';
+		}
+		asort($strings_file_paths);
+		foreach($strings_file_paths as $strings_file_path) {
+			$path_array = explode('/', $strings_file_path);
+			$langs[$path_array[2]] = $path_array[2];
 		}
 	}
-	return $lang_choices;
+	return $langs;
 }