Don't force edit encoding when LanguageEo.php is loaded; defer until $wgContLang...

This makes editing work on other languages with UI language set to Esperanto in preferences.

diff --git a/includes/Setup.php b/includes/Setup.php
index f62fda0..a20d6ac 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -286,6 +286,7 @@ $wgContLanguageCode = $wgLanguageCode;
 $wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
 
 $wgContLang = setupLangObj( $wgContLangClass );
+$wgContLang->initEncoding();
 
 // set default user option from content language
 if( !$wgUser->mDataLoaded ) {

diff --git a/languages/Language.php b/languages/Language.php
index 3d49e7c..7b5fe18 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2083,6 +2083,14 @@ class Language {
                return $s[0];
        }
 
+       function initEncoding() {
+               # Some languages may have an alternate char encoding option
+               # (Esperanto X-coding, Japanese furigana conversion, etc)
+               # If this language is used as the primary content language,
+               # an override to the defaults can be set here on startup.
+               #global $wgInputEncoding, $wgOutputEncoding, $wgEditEncoding;
+       }
+
        function setAltEncoding() {
                # Some languages may have an alternate char encoding option
                # (Esperanto X-coding, Japanese furigana conversion, etc)

diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index d931b30..2c11844 100644 (file)
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -1,8 +1,5 @@
 <?php
 require_once("LanguageUtf8.php");
-$wgInputEncoding       = "utf-8";
-$wgOutputEncoding      = "utf-8";
-$wgEditEncoding                = "x";
 
 # See language.doc
 
@@ -1140,13 +1137,20 @@ class LanguageEo extends LanguageUtf8 {
                return $s;
        }
 
+       function initEncoding() {
+               global $wgEditEncoding, $wgInputEncoding, $wgOutputEncoding;
+               $wgInputEncoding = "utf-8";
+               $wgOutputEncoding = "utf-8";
+               $wgEditEncoding = "x";
+       }
+
        function setAltEncoding() {
                global $wgEditEncoding, $wgInputEncoding, $wgOutputEncoding;
                $wgInputEncoding = "utf-8";
                $wgOutputEncoding = "x";
                $wgEditEncoding = "";
        }
-
+       
 }
 
 ?>