Changeset 858 for trunk/Application/System.php

Timestamp:

May 8, 2019, 7:59:39 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Missing intialization of some variables.
• Fixed: Missing appmodule dependencies.

File:

• trunk/Application/System.php (modified) (3 diffs)

trunk/Application/System.php

@@ -141 +141 @@
   {
     global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
-      $DatabaseRevision, $Config;
+      $DatabaseRevision, $Config, $GlobalLocaleManager;
 
     date_default_timezone_set('Europe/Prague');
@@ -171 +171 @@
       //$Output .= 'Nelze se připojit k databázi.';
     }
+
+    $this->LocaleManager = new LocaleManager($this);
+    $this->LocaleManager->Dir = dirname(dirname(__FILE__)).'/locale';
+    $this->LocaleManager->Available = array(
+      'cs' => array('Code' => 'cs', 'Title' => 'Česky'),
+      'en' => array('Code' => 'en', 'Title' => 'English'),
+    );
+    $GlobalLocaleManager = $this->LocaleManager;
+    $this->LinkLocaleExceptions = array('images', 'style', 'files');
+
     if(isset($this->Config['Web']['RootFolder']))
       $this->RootURLFolder = $this->Config['Web']['RootFolder'];
@@ -195 +205 @@
     {
       $this->PathItems = ProcessURL();
+
+      // Detect interface locale
+      if(isset($this->Config['Web']['Locale']))
+        $this->LocaleManager->DefaultLangCode = $this->Config['Web']['Locale'];
+      $this->LocaleManager->LangCode = $this->LocaleManager->DefaultLangCode;
+      if(count($this->PathItems) > 0)
+      {
+         $NewLangCode = $this->PathItems[0];
+         if(array_key_exists($NewLangCode, $this->LocaleManager->Available)) 
+         {
+           array_shift($this->PathItems);
+           $this->LocaleManager->LangCode = $NewLangCode;
+         }
+      }
+      if(array_key_exists($this->LocaleManager->LangCode, $this->LocaleManager->Available))
+        $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
+
       $this->ShowPage();
     }