Changeset 843 for trunk/includes

Timestamp:

Jan 14, 2016, 10:25:47 PM (9 years ago)

Author:

chronos

Message:

• Added: Support for translatable URLs. Now each language can have URL in its language.

This requires to all links inside web to use System->Link function which is responsible for translation.
All links need to be written in english so they can be translated to other language.

Location:

trunk/includes

Files:

• Locale.php (modified) (2 diffs)
• Version.php (modified) (1 diff)
• system.php (modified) (9 diffs)

trunk/includes/Locale.php

@@ -18 +18 @@
   }
 
-  function Translate($Text)
-  {
-    if(array_key_exists($Text, $this->Data) and ($this->Data[$Text] != ''))
-      return($this->Data[$Text]);
+  function Translate($Text, $Group = '')
+  {
+    if(array_key_exists($Text, $this->Data[$Group]) and ($this->Data[$Group][$Text] != ''))
+      return($this->Data[$Group][$Text]);
       else return($Text);
+  }
+
+  function TranslateReverse($Text, $Group = '')
+  {
+    $Key = array_search($Text, $this->Data[$Group]);
+    if(($Key === FALSE) or ($this->Data[$Group][$Key] == '')) return($Text);
+      else return($Key);
   }
 }
@@ -232 +239 @@
 }
 
-// Short named global function
-function T($Text)
+// Short named global translation function
+function T($Text, $Group = '')
 {
   global $GlobalLocaleManager;
 
-  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text));
+  if(isset($GlobalLocaleManager)) return($GlobalLocaleManager->CurrentLocale->Texts->Translate($Text, $Group));
     else return($Text);
 }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 842; // Subversion revision
+$Revision = 843; // Subversion revision
 $DatabaseRevision = 811; // Database structure revision
-$ReleaseTime = '2016-01-12';
+$ReleaseTime = '2016-01-14';

trunk/includes/system.php

@@ -9 +9 @@
   var $OnPageNotFound;
   var $Pages;
+  /* @var LocaleManager */
+  var $LocaleManager;
 
   function __construct()
@@ -23 +25 @@
   function Init()
   {
-    global $GlobalLocaleManager;
+    global $GlobalLocaleManager, $Config;
+
+    $this->Config = $Config;
+    date_default_timezone_set($this->Config['Web']['Timezone']);
 
     $this->Database->Connect($this->Config['Database']['Host'],
@@ -55 +60 @@
       }
     }
-    $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
+    if(array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
+      $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
 
     $this->Menu = array
@@ -93 +99 @@
   function Run()
   {
-    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager, $Config,
+    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager,
       $UpdateManager, $DatabaseRevision;
 
-    $this->Config = $Config;
     $ScriptStartTime = GetMicrotime();
-
     if(GetRemoteAddress() != '') session_start();
 
     if(!isset($this->Config)) die('Systém není nainstalován. Pokračujte v instalaci <a href="admin/install.php">zde</a>.');
-    date_default_timezone_set($this->Config['Web']['Timezone']);
 
     $this->Init();
@@ -181 +184 @@
   }
 
+  function TranslateURL($URL, $Locale)
+  {
+    // Try translate URL directory parts from current locale to target locale
+    $Remaining = $URL;
+    $RemainingParts = explode('?', $Remaining);
+    $Directory = $RemainingParts[0];
+    if(count($RemainingParts) > 1)
+    {
+      $Params = $RemainingParts[1];
+    } else {
+      $Params = '';
+    }
+    $TargetLocaleManager = new LocaleManager($this);
+    $TargetLocaleManager->Dir = $this->LocaleManager->Dir;
+    $TargetLocaleManager->Available = $this->LocaleManager->Available;
+    $TargetLocaleManager->LoadLocale($Locale);
+
+    $DirectoryParts = explode('/', $Directory);
+    foreach($DirectoryParts as $Index => $Item)
+    {
+      $NewText = $TargetLocaleManager->CurrentLocale->Texts->Translate($Item, 'URL');
+      $DirectoryParts[$Index] = $NewText;
+    }
+    $Directory = implode('/', $DirectoryParts);
+    $Remaining = $Directory;
+    if($Params != '') $Remaining .= '?'.$Params;
+
+    return($Remaining);
+  }
+
+  function TranslateReverseURL($URL, $Locale)
+  {
+    // Try translate URL directory parts from current locale to target locale
+    $Remaining = $URL;
+    $RemainingParts = explode('?', $Remaining);
+    $Directory = $RemainingParts[0];
+    if(count($RemainingParts) > 1)
+    {
+      $Params = $RemainingParts[1];
+    } else {
+      $Params = '';
+    }
+    $TargetLocaleManager = new LocaleManager($this);
+    $TargetLocaleManager->Dir = $this->LocaleManager->Dir;
+    $TargetLocaleManager->Available = $this->LocaleManager->Available;
+    $TargetLocaleManager->LoadLocale($Locale);
+
+    $DirectoryParts = explode('/', $Directory);
+    foreach($DirectoryParts as $Index => $Item)
+    {
+      $NewText = $TargetLocaleManager->CurrentLocale->Texts->TranslateReverse($Item, 'URL');
+      $DirectoryParts[$Index] = $NewText;
+    }
+    $Directory = implode('/', $DirectoryParts);
+    $Remaining = $Directory;
+    if($Params != '') $Remaining .= '?'.$Params;
+
+    return($Remaining);
+  }
+
   function LinkLocale($Target, $Locale = '')
   {
     if($Locale == '') $Locale = $this->LocaleManager->LangCode;
+
+    $Target = $this->TranslateURL($Target, $Locale);
+
     if($Locale == $this->LocaleManager->DefaultLangCode)
       return($this->Config['Web']['BaseURL'].$Target);
@@ -216 +282 @@
     if(count($PathItems) == 0) $PathItems = array('');
     $PathItem = $PathItems[0];
+    $PathItem = $this->LocaleManager->CurrentLocale->Texts->TranslateReverse($PathItem, 'URL');
+
     if(array_key_exists($PathItem, $Pages))
     {
@@ -286 +354 @@
       if($Locale['Code'] == $this->System->LocaleManager->CurrentLocale->Texts->Code) $Selected = ' selected="selected"';
         else $Selected = '';
+      $Remaining = $this->System->TranslateReverseURL($Remaining, $this->System->LocaleManager->LangCode);
+
       $URL = $this->System->LinkLocale($Remaining, $Locale['Code']);
       $Output .= '<option title="" value="'.$URL.'"'.$Selected.' onchange="this.form.submit()">'.$Locale['Title'].'</option>';
@@ -306 +376 @@
       //$Output .= ''<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>';
       $Output .= $this->System->User->Name.' <a href="'.$this->System->Link('/?action=logout').'">'.T('Logout').'</a>'.
-          ' <a href="'.$this->System->Link('/user.php?user='.$this->System->User->Id).'">'.T('My page').'</a>'.
-          ' <a href="'.$this->System->Link('/Options.php').'">'.T('Options').'</a>'.
+          ' <a href="'.$this->System->Link('/user/?user='.$this->System->User->Id).'">'.T('My page').'</a>'.
+          ' <a href="'.$this->System->Link('/options/').'">'.T('Options').'</a>'.
           ' <a title="Vámi přeložené texty" href="'.$this->System->Link('/TranslationList.php?user='.
           $this->System->User->Id.'&amp;group=0&amp;state=2&amp;text=&amp;entry=').'">'.T('Translated').'</a>'.
@@ -317 +387 @@
     {
       $Output .= '<a href="'.$this->System->Link('/login/').'">'.T('Login').'</a>&nbsp;'.
-          '<a href="'.$this->System->Link('/registrace.php').'">'.T('Registration').'</a>';
+        '<a href="'.$this->System->Link('/registration/').'">'.T('Registration').'</a>';
     }
     $Output .= $this->ShowLocaleSelector();