Change LanguageEn to be UTF-8 by default. This fixes the problem with

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index c48aa8e..03de205 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -40,8 +40,11 @@ if( $wgUseSquid && isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
                array_pop($hopips);
        }
        $wgIP = trim(end($hopips));
+} elseif( isset( $_SERVER['REMOTE_ADDR'] ) ) {
+       $wgIP = $_SERVER['REMOTE_ADDR'];
 } else {
-       $wgIP = getenv('REMOTE_ADDR');
+       # Running on CLI?
+       $wgIP = '127.0.0.1';
 }
 
 
@@ -74,12 +77,13 @@ $wgRequest = new WebRequest();
 
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
-global $wgUser, $wgLang, $wgOut, $wgTitle;
+global $wgUser, $wgLang, $wgContLang, $wgOut, $wgTitle;
+global $wgLangClass, $wgContLangClass;
 global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
 global $wgMsgCacheExpiry, $wgCommandLineMode;
-global $wgBlockCache, $wgParserCache, $wgParser, $wgDBConnections;
+global $wgBlockCache, $wgParserCache, $wgParser, $wgDBConnections, $wgMsgParserOptions;
 global $wgLoadBalancer, $wgDBservers, $wgDebugDumpSql;
 global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype;
 global $wgUseOldExistenceCheck, $wgEnablePersistentLC;
@@ -216,50 +220,88 @@ if( $wgCommandLineMode ) {
        $wgUser = User::loadFromSession();
 }
 
-// FIXME : we don't know what the user entered (see SpecialPreferences.php [AV])
-if(isset($wgUser->mOptions['language'])) {
-       // Change language of the site
-       $wgLanguageCode = $wgUser->mOptions['language'];
-       // we will load messages from file instead of from database
-       $wgUseDatabaseMessages = false;
-       }
-
 wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-language' );
-require_once( 'languages/Language.php' );
 
-$wgMessageCache = new MessageCache;
+function setupLangObj(&$langclass, $langcode) {
+       global $wgUseLatin1;
 
-$wgLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgLanguageCode ) );
-if( ! class_exists( $wgLangClass ) || ($wgLanguageCode == 'en' && !$wgUseLatin1) ) {
-       # Default to English/UTF-8
-       require_once( 'languages/LanguageUtf8.php' );
-       $wgLangClass = 'LanguageUtf8';
-}
 
-$wgLang = new $wgLangClass();
-if ( !is_object($wgLang) ) {
-       print "No language class ($wgLang)\N";
-}
+       if( ! class_exists( $langclass ) ) {
+               # Default to English/UTF-8
+               require_once( 'languages/LanguageUtf8.php' );
+               $langclass = 'LanguageUtf8';
+       }
+
+       $lang = new $langclass();
+       if ( !is_object($lang) ) {
+               print "No language class ($wgLang)\N";
+       }
 
-if( $wgUseLatin1 && $wgLanguageCode != 'en' ) {
-       # For non-UTF-8 non-English.
-       require_once( 'languages/LanguageLatin1.php' );
-       $xxx = new LanguageLatin1( $wgLang );
-       unset( $wgLang );
-       $wgLang = $xxx;
+       if( $wgUseLatin1 ) {
+               # For non-UTF-8 latin-1 downconversion
+               require_once( 'languages/LanguageLatin1.php' );
+               $xxx = new LanguageLatin1( $lang );
+               unset( $lang );
+               $lang = $xxx;
+       }
+       return $lang;
 }
 
-// now that we have a language object, set per language user defaults options
-// if we didn't grabbed them from database.
+require_once( 'languages/Language.php' );
+
+$wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
+
+$wgContLang = setupLangObj($wgContLangClass, $wgContLangClass);
+ $n = get_class($wgContLang);
+
+// set default user option from content language
 if(!$wgUser->mDataLoaded) { $wgUser->loadDefaultFromLanguage(); }
 
+// wgLanguageCode now specifically means the UI language
+$wgLanguageCode = $wgUser->getOption('language');
+
+$wgLangClass = 'Language'. str_replace( '-', '_', ucfirst( $wgLanguageCode ) );
+
+if($wgLangClass == $wgContLangClass ) {
+       $wgLang = &$wgContLang;
+}
+else {
+       include_once("languages/$wgLangClass.php");
+       $wgLang = setupLangObj($wgLangClass, $wgLanguageCode);
+}
+
+
 wfProfileOut( $fname.'-language' );
 wfProfileIn( $fname.'-MessageCache' );
 
-$wgMessageCache->initialise( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname );
+$wgMessageCache = new MessageCache;
+$wgMessageCache->initialise( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname);
 
 wfProfileOut( $fname.'-MessageCache' );
+
+#
+# I guess the warning about UI switching might still apply...
+#
+# FIXME: THE ABOVE MIGHT BREAK NAMESPACES, VARIABLES,
+# SEARCH INDEX UPDATES, AND MANY MANY THINGS.
+# DO NOT USE THIS MODE EXCEPT FOR TESTING RIGHT NOW.
+#
+# To disable it, the easiest thing could be to uncomment the 
+# following; they should effectively disable the UI switch functionality
+#
+# $wgLangClass = $wgContLangClass;
+# $wgLanguageCode = $wgContLanguageCode;
+# $wgLang = $wgContLang;
+#
+# TODO: Need to change reference to $wgLang to $wgContLang at proper 
+#       places, including namespaces, dates in signatures, magic words,
+#       and links
+#
+# TODO: Need to look at the issue of input/output encoding
+#
+
+
 wfProfileIn( $fname.'-OutputPage' );
 
 $wgOut = new OutputPage();
@@ -290,10 +332,11 @@ $wgParserCache = new ParserCache();
 $wgParser = new Parser();
 $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 $wgDBConnections = array();
+$wgMsgParserOptions = ParserOptions::newFromUser($wgUser);
 wfSeedRandom();
 
 # Placeholders in case of DB error
-$wgTitle = Title::newFromText( wfMsg( 'badtitle' ) );
+$wgTitle = Title::newFromText( wfMsgForContent( 'badtitle' ) );
 $wgArticle = new Article($wgTitle);
 
 wfProfileOut( $fname.'-misc2' );