Changeset 841 for trunk/includes/Locale.php

Timestamp:

Jan 12, 2016, 10:33:43 PM (8 years ago)

Author:

chronos

Message:

• Modified: Improved language switching using language code in URL. This is more search engine friendly as each language have own fixed URL.

File:

• trunk/includes/Locale.php (modified) (4 diffs)

trunk/includes/Locale.php

@@ -162 +162 @@
   var $Codes;
   var $Dir;
+  var $LangCode;
+  var $DefaultLangCode;
+  var $Available;
 
   function __construct(System $System)
@@ -168 +171 @@
     $this->Codes = array('en');
     $this->CurrentLocale = new LocaleFile($System);
+    $this->LangCode = 'en';
+    $this->DefaultLangCode = 'en';
+    $this->Available = array();
   }
 
@@ -218 +224 @@
   function LoadLocale($Code)
   {
-    $this->CurrentLocale->Dir = $this->Dir;
-    $this->CurrentLocale->Load($Code);
+    if(array_key_exists($Code, $this->Available))
+    {
+      $this->CurrentLocale->Dir = $this->Dir;
+      $this->CurrentLocale->Load($Code);
+    } else throw new Exception('Unsupported locale code '.$Code);
   }
 }
@@ -226 +235 @@
 function T($Text)
 {
-  global $LocaleManager;
-
-  if(isset($LocaleManager)) return($LocaleManager->CurrentLocale->Texts->Translate($Text));
+  global $GlobalLocaleManager;
+
+  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text));
     else return($Text);
 }