Avoid gratuitously breaking configurations: continue to use
$wgLanguageCode in LocalSettings.php, and pass that value on to $wgContLanguageCode internally.
This commit is contained in:
parent
869024bcb4
commit
5537c5b85e
3 changed files with 6 additions and 2 deletions
|
|
@ -885,7 +885,7 @@ if ( \$wgCommandLineMode ) {
|
|||
|
||||
\$wgLocalInterwiki = \$wgSitename;
|
||||
|
||||
\$wgContLanguageCode = \"{$slconf['LanguageCode']}\";
|
||||
\$wgLanguageCode = \"{$slconf['LanguageCode']}\";
|
||||
\$wgUseLatin1 = " . ($conf->Latin1 ? 'true' : 'false') . ";\n
|
||||
|
||||
\$wgProxyKey = \"$proxyKey\";
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ $wgUseTurckShm = false;
|
|||
* Default to 'en'. Should be one of ./language/Language(.*).php
|
||||
* @global string $wgLanguageCode
|
||||
*/
|
||||
$wgContLanguageCode = 'en';
|
||||
$wgLanguageCode = 'en';
|
||||
|
||||
/**
|
||||
* Filename of a language file generated by dumpMessages.php
|
||||
|
|
|
|||
|
|
@ -250,6 +250,10 @@ function setupLangObj(&$langclass, $langcode) {
|
|||
|
||||
require_once( 'languages/Language.php' );
|
||||
|
||||
# $wgLanguageCode may be changed later to fit with user preference.
|
||||
# The content language will remain fixed as per the configuration,
|
||||
# so let's keep it.
|
||||
$wgContLanguageCode = $wgLanguageCode;
|
||||
$wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
|
||||
|
||||
$wgContLang = setupLangObj( $wgContLangClass, $wgContLangClass );
|
||||
|
|
|
|||
Loading…
Reference in a new issue