Merge remote-tracking branch 'remotes/fusionpbx/master' into Install_Rewrite

core/app_languages.php

@@ -0,0 +1,18 @@
+<?php
+
+// Fill in the value in the native language
+// rename the corerct flag in /theme/flags/*.png
+
+$language_name['en-us'] = "English - United States";
+$language_name['es-cl'] = "Español - Chile";
+$language_name['pt-pt'] = "Português - Portugal";
+$language_name['fr-fr'] = "Français - France";
+$language_name['nl-nl'] = "Nederlands - De Nederland";
+$language_name['pt-br'] = "Brasileiro - Português";
+$language_name['pl'] = "Polski - Polska";
+$language_name['sv-se'] = "Svenska - Sverige";
+$language_name['uk'] = "Українська - Україна";
+$language_name['de-at'] = "Deutsch - Österreich";
+$language_name['ar-eg'] = "العربية - مصر";
+
+?>

resources/classes/text.php

@@ -1,19 +1,16 @@
 <?php
-
 /**
  * Get the text for the correct translation
  *
  * @method array get
  */
 class text {
-
 	/**
 	 * Called when the object is created
 	 */
 	public function __construct() {
 		//place holder
 	}
-
 	/**
 	 * Called when there are no references to a particular object
 	 * unset the variables used in the class
@@ -23,13 +20,14 @@ class text {
 			unset($this->$key);
 		}
 	}
-
 	/**
 	 * Get a specific item from the cache
 	 * @var string $language_code	examples: en-us, es-cl, fr-fr, pt-pt
 	 * @var string $app_path		examples: app/exec or core/domains
 	 */
 	public function get($language_code = null, $app_path = null) {
+		//get the global app_languages.php
+			include $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/core/app_languages.php";
 		//get the app_languages.php
 			if ($app_path != null) {
 				include $_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/".$app_path."/app_languages.php";
@@ -37,7 +35,6 @@ class text {
 			else {
 				include getcwd().'/app_languages.php';
 			}
-
 		//get the available languages
 			krsort($text);
 			foreach ($text as $lang_label => $lang_codes) {
@@ -48,24 +45,32 @@ class text {
 				}
 			}
 			$_SESSION['app']['languages'] = array_unique($app_languages);
-
+		//check the session language
+			if(isset($_SESSION['domain'])){
+				$language_code = $_SESSION['domain']['language']['code'];
+			}elseif($language_code == null){
+				$language_code = 'en-us';
+			}
 		//reduce to specific language
 			if ($language_code != 'all') {
 				foreach($text as $key => $value) {
-					if ($language_code == null) {
-						$text[$key] = $value[$_SESSION['domain']['language']['code']];
-					}
-					else {
-						$text[$key] = $value[$language_code];
+					$text[$key] = $value[$language_code];
+				}
+			}
+			if ($language_code != 'all') {
+				foreach($language_name as $code => $value) {
+					$text["language-$code"] = $value;
+				}
+			}else{
+				foreach($language_name as $code => $value) {
+					foreach($language_name as $c_code => $value) {
+						$text["language-$code"][$c_code] = $value;
 					}
 				}
 			}
-
+			
 		//return the array of translations
 			return $text;
-
 	}
-
 }
-
 ?>