Changeset 619

Timestamp:

Dec 4, 2013, 1:07:24 AM (11 years ago)

Author:

chronos

Message:

• Modified: Rename class Locale which colide with intl extension.

Location:

trunk

Files:

• admin/install.php (modified) (1 diff)
• includes/Locale.php (modified) (5 diffs)
• includes/Version.php (modified) (1 diff)

trunk/admin/install.php

@@ -12 +12 @@
 include_once(dirname(__FILE__).'/../includes/Version.php');
 include_once(dirname(__FILE__).'/../includes/Locale.php');
-$Locale = new Locale();
+$Locale = new LocaleFile();
 $Locale->Dir = dirname(__FILE__).'/../locale';
 $Locale->Load($Config['Web']['Locale']);

trunk/includes/Locale.php

@@ -26 +26 @@
 }
 
-class Locale extends Model
+class LocaleFile extends Model
 {
         var $Texts;
@@ -167 +167 @@
                 parent::__construct($System);
                 $this->Codes = array('en');
-                $this->CurrentLocale = new Locale($System);             
+                $this->CurrentLocale = new LocaleFile($System);         
         }
         
@@ -179 +179 @@
           {             
                 $Code = substr($FileName, 0, -4);
-                $Locale = new Locale($this->System);
+                $Locale = new LocaleFile($this->System);
                 $Locale->Dir = $this->Dir;
                 $Locale->Load($Code);
@@ -189 +189 @@
         function UpdateAll($Directory)
         {
-                $Locale = new Locale($this->System);
+                $Locale = new LocaleFile($this->System);
                 $Locale->AnalyzeCode($Directory);
           $FileList = scandir($this->Dir);
@@ -196 +196 @@
           if(substr($FileName, -4) == '.php')
           {             
-                  $FileLocale = new Locale($this->System);
+                  $FileLocale = new LocaleFile($this->System);
                   $FileLocale->Dir = $this->Dir;                  
                   $FileLocale->Load(substr($FileName, 0, -4));

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 618; // Subversion revision
+$Revision = 619; // Subversion revision
 $DatabaseRevision = 610; // Database structure revision 
 $ReleaseTime = '2013-12-04';