}
function get( $key, $useDB = true, $forcontent = true, $isfullkey = false ) {
- global $wgContLanguageCode, $wgContLang;
+ global $wgContLanguageCode, $wgContLang, $wgLang;
if( $forcontent ) {
$lang =& $wgContLang;
- $langcode = $wgContLanguageCode;
} else {
- global $wgLang, $wgLanguageCode;
$lang =& $wgLang;
- $langcode = $wgLanguageCode;
}
+ $langcode = $lang->getCode();
# If uninitialised, someone is trying to call this halfway through Setup.php
if( !$this->mInitialised ) {
return '<' . htmlspecialchars($key) . '>';
}
function feedTitle() {
- global $wgLanguageCode, $wgSitename;
+ global $wgContLanguageCode, $wgSitename;
$page = SpecialPage::getPage( $this->getName() );
$desc = $page->getDescription();
- return "$wgSitename - $desc [$wgLanguageCode]";
+ return "$wgSitename - $desc [$wgContLanguageCode]";
}
function feedDesc() {
$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
}
+# These are now the same, always
+# To determine the user language, use $wgLang->getCode()
+$wgContLanguageCode = $wgLanguageCode;
+
wfProfileOut( $fname.'-misc1' );
wfProfileIn( $fname.'-memcached' );
));
}
-# $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;
-
$wgLoadBalancer = new StubObject( 'wgLoadBalancer', 'LoadBalancer',
array( $wgDBservers, false, $wgMasterWaitTimeout, true ) );
$wgContLang = new StubContLang;
*/
function buildSidebar() {
global $wgDBname, $parserMemc, $wgEnableSidebarCache;
- global $wgLanguageCode, $wgContLanguageCode;
+ global $wgLang, $wgContLang;
$fname = 'SkinTemplate::buildSidebar';
$key = "{$wgDBname}:sidebar";
$cacheSidebar = $wgEnableSidebarCache &&
- ($wgLanguageCode == $wgContLanguageCode);
+ ($wgLang->getCode() == $wgContLang->getCode());
if ($cacheSidebar) {
$cachedsidebar = $parserMemc->get( $key );
*
*/
function makePhp($messages) {
- global $wgLanguageCode;
+ global $wgLang;
$txt = "\n\n\$messages = array(\n";
foreach( $messages as $key => $m ) {
- if(strtolower($wgLanguageCode) != 'en' and $m['msg'] == $m['enmsg'] ) {
+ if($wgLang->getCode() != 'en' and $m['msg'] == $m['enmsg'] ) {
//if (strstr($m['msg'],"\n")) {
// $txt.='/* ';
// $comment=' */';
*
*/
function makeHTMLText( $messages ) {
- global $wgLang, $wgUser, $wgLanguageCode, $wgContLanguageCode;
+ global $wgLang, $wgContLang, $wgUser;
$fname = "makeHTMLText";
wfProfileIn( $fname );
foreach( $messages as $key => $m ) {
$title = $wgLang->ucfirst( $key );
- if($wgLanguageCode != $wgContLanguageCode)
- $title.="/$wgLanguageCode";
+ if($wgLang->getCode() != $wgContLang->getCode())
+ $title.= '/' . $wgLang->getCode();
$titleObj =& Title::makeTitle( NS_MEDIAWIKI, $title );
$talkPage =& Title::makeTitle( NS_MEDIAWIKI_TALK, $title );
}
function _newObject() {
- global $wgLanguageCode, $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
- // wgLanguageCode now specifically means the UI language
- $wgLanguageCode = $wgRequest->getText('uselang', '');
- if ($wgLanguageCode == '')
- $wgLanguageCode = $wgUser->getOption('language');
- # Validate $wgLanguageCode
- if( empty( $wgLanguageCode ) || !preg_match( '/^[a-z]+(-[a-z]+)?$/', $wgLanguageCode ) ) {
- $wgLanguageCode = $wgContLanguageCode;
+ global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
+ $code = $wgRequest->getText('uselang', '');
+ if ($code == '')
+ $code = $wgUser->getOption('language');
+ # Validate $code
+ if( empty( $code ) || !preg_match( '/^[a-z]+(-[a-z]+)?$/', $code ) ) {
+ $code = $wgContLanguageCode;
}
- if( $wgLanguageCode == $wgContLanguageCode ) {
+ if( $code == $wgContLanguageCode ) {
return $wgContLang;
} else {
- $obj = Language::factory( $wgLanguageCode );
+ $obj = Language::factory( $code );
return $obj;
}
}