Changeset 484

Timestamp:

2007-07-20 11:04:02 (18 months ago)

Author:

wwalc

Message:

i18n handling improved

Location:

MediaWiki/trunk/extensions/FCKeditor

Files:

• FCKeditor.body.php (modified) (3 diffs)
• FCKeditor.i18n.en.php (added)
• FCKeditor.i18n.php (deleted)
• FCKeditor.i18n.pl.php (added)
• FCKeditor.php (modified) (1 diff)
• FCKeditor.setup.php (deleted)

MediaWiki/trunk/extensions/FCKeditor/FCKeditor.body.php

@@ -45 +45 @@
     }
     
-    public function name()
-    {
-        
-    }
-
     private function getExcludedNamespaces()
     {
@@ -97 +92 @@
     public function onMessagesPreLoad()
     {
-        global $wgMessageCache;
+        global $wgMessageCache, $wgUser, $wgContLanguageCode;
 
         if ( !self::$messagesLoaded ) {
-            require( dirname( __FILE__ ) . DIRECTORY_SEPARATOR .'FCKeditor.i18n.php' );
-            foreach ( $allMessages as $lang => $langMessages ) {
-                $wgMessageCache->addMessages( $langMessages, $lang );
-            }
+            $lang = $wgUser->getOption( 'language', $wgContLanguageCode );
+            $i18nfile = dirname( __FILE__ ) . DIRECTORY_SEPARATOR .'FCKeditor.i18n.' . $lang . '.php';
+            
+            if ( file_exists( $i18nfile ) ) {
+                require( $i18nfile );
+            } else {
+                $lang = 'en';
+                require( dirname( __FILE__ ) . DIRECTORY_SEPARATOR .'FCKeditor.i18n.en.php' );
+            }
+            
+            $wgMessageCache->addMessages( $allMessages, $lang );
             self::$messagesLoaded = true;
         }
@@ -290 +292 @@
         global $wgFCKEditorToolbarSet;
         global $wgFCKEditorDir, $wgFCKEditorHeight, $wgUser;
-
+                
         if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' )) {
             return true;

MediaWiki/trunk/extensions/FCKeditor/FCKeditor.php

@@ -29 +29 @@
 ini_set("display_errors", 1);
 
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditor.i18n.php";
 require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . "FCKeditor.body.php";