Remove $wgContLanguageCode usage in core.

sed -i 's/$wgContLanguageCode/$wgLanguageCode/g'
These are now the same, always. Per and since r15827.

$wgLanguageCode wins due to being the one set by LocalSettings.

$wgContLanguageCode definition at includes/Setup.php kept for now.

diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index 5e0ebb1..f07b650 100644 (file)
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -27,8 +27,8 @@ class ChangesFeed {
         * @return ChannelFeed subclass or false on failure
         */
        public function getFeedObject( $title, $description ) {
-               global $wgSitename, $wgContLanguageCode, $wgFeedClasses, $wgTitle;
-               $feedTitle = "$wgSitename  - {$title} [$wgContLanguageCode]";
+               global $wgSitename, $wgLanguageCode, $wgFeedClasses, $wgTitle;
+               $feedTitle = "$wgSitename  - {$title} [$wgLanguageCode]";
                if( !isset($wgFeedClasses[$this->format] ) )
                        return false;
                return new $wgFeedClasses[$this->format](

diff --git a/includes/Export.php b/includes/Export.php
index 2342817..b4f28be 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -362,7 +362,7 @@ class XmlDumpWriter {
         * @return string
         */
        function openStream() {
-               global $wgContLanguageCode;
+               global $wgLanguageCode;
                $ver = $this->schemaVersion();
                return Xml::element( 'mediawiki', array(
                        'xmlns'              => "http://www.mediawiki.org/xml/export-$ver/",
@@ -370,7 +370,7 @@ class XmlDumpWriter {
                        'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
                                                "http://www.mediawiki.org/xml/export-$ver.xsd",
                        'version'            => $ver,
-                       'xml:lang'           => $wgContLanguageCode ),
+                       'xml:lang'           => $wgLanguageCode ),
                        null ) .
                        "\n" .
                        $this->siteInfo();

diff --git a/includes/Feed.php b/includes/Feed.php
index 5593601..a80e6b7 100644 (file)
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -137,8 +137,8 @@ class FeedItem {
         * @return String
         */
        public function getLanguage() {
-               global $wgContLanguageCode;
-               return $wgContLanguageCode;
+               global $wgLanguageCode;
+               return $wgLanguageCode;
        }
 
        /**

diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index 8990fd9..3b4a886 100644 (file)
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -134,7 +134,7 @@ class HTMLFileCache {
 
        /* Working directory to/from output */
        public function loadFromFileCache() {
-               global $wgOut, $wgMimeType, $wgOutputEncoding, $wgContLanguageCode;
+               global $wgOut, $wgMimeType, $wgOutputEncoding, $wgLanguageCode;
                wfDebug( __METHOD__ . "()\n");
                $filename = $this->fileCacheName();
                // Raw pages should handle cache control on their own,
@@ -142,7 +142,7 @@ class HTMLFileCache {
                if( $this->mType !== 'raw' ) {
                        $wgOut->sendCacheControl();
                        header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" );
-                       header( "Content-Language: $wgContLanguageCode" );
+                       header( "Content-Language: $wgLanguageCode" );
                }
 
                if( $this->useGzip() ) {

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index eecd610..6b8860c 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -334,7 +334,7 @@ class MessageCache {
         */
        function loadFromDB( $code ) {
                wfProfileIn( __METHOD__ );
-               global $wgMaxMsgCacheEntrySize, $wgContLanguageCode, $wgAdaptiveMessageCache;
+               global $wgMaxMsgCacheEntrySize, $wgLanguageCode, $wgAdaptiveMessageCache;
                $dbr = wfGetDB( DB_SLAVE );
                $cache = array();
 
@@ -347,14 +347,14 @@ class MessageCache {
                $mostused = array();
                if ( $wgAdaptiveMessageCache ) {
                        $mostused = $this->getMostUsedMessages();
-                       if ( $code !== $wgContLanguageCode ) {
+                       if ( $code !== $wgLanguageCode ) {
                                foreach ( $mostused as $key => $value ) $mostused[$key] = "$value/$code";
                        }
                }
 
                if ( count( $mostused ) ) {
                        $conds['page_title'] = $mostused;
-               } elseif ( $code !== $wgContLanguageCode ) {
+               } elseif ( $code !== $wgLanguageCode ) {
                        $conds[] = 'page_title' . $dbr->buildLike( $dbr->anyString(), "/$code" );
                } else {
                        # Effectively disallows use of '/' character in NS_MEDIAWIKI for uses
@@ -534,7 +534,7 @@ class MessageCache {
         *                   "msg/lang".
         */
        function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) {
-               global $wgContLanguageCode, $wgContLang;
+               global $wgLanguageCode, $wgContLang;
 
                if ( !is_string( $key ) ) {
                        throw new MWException( "Non-string key given" );
@@ -568,7 +568,7 @@ class MessageCache {
                # Try the MediaWiki namespace
                if( !$this->mDisable && $useDB ) {
                        $title = $uckey;
-                       if(!$isFullKey && ( $langcode != $wgContLanguageCode ) ) {
+                       if(!$isFullKey && ( $langcode != $wgLanguageCode ) ) {
                                $title .= '/' . $langcode;
                        }
                        $message = $this->getMsgFromNamespace( $title, $langcode );
@@ -599,8 +599,8 @@ class MessageCache {
                # Is this a custom message? Try the default language in the db...
                if( ($message === false || $message === '-' ) &&
                        !$this->mDisable && $useDB &&
-                       !$isFullKey && ($langcode != $wgContLanguageCode) ) {
-                       $message = $this->getMsgFromNamespace( $uckey, $wgContLanguageCode );
+                       !$isFullKey && ($langcode != $wgLanguageCode) ) {
+                       $message = $this->getMsgFromNamespace( $uckey, $wgLanguageCode );
                }
 
                # Final fallback
@@ -813,15 +813,15 @@ class MessageCache {
        }
 
        public function figureMessage( $key ) {
-               global $wgContLanguageCode;
+               global $wgLanguageCode;
                $pieces = explode( '/', $key );
                if( count( $pieces ) < 2 )
-                       return array( $key, $wgContLanguageCode );
+                       return array( $key, $wgLanguageCode );
 
                $lang = array_pop( $pieces );
                $validCodes = Language::getLanguageNames();
                if( !array_key_exists( $lang, $validCodes ) )
-                       return array( $key, $wgContLanguageCode );
+                       return array( $key, $wgLanguageCode );
 
                $message = implode( '/', $pieces );
                return array( $message, $lang );

diff --git a/includes/Metadata.php b/includes/Metadata.php
index bd24249..508afb6 100644 (file)
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -63,11 +63,11 @@ abstract class RdfMetaData {
        }
 
        protected function basics() {
-               global $wgContLanguageCode, $wgSitename;
+               global $wgLanguageCode, $wgSitename;
 
                $this->element( 'title', $this->mArticle->mTitle->getText() );
                $this->pageOrString( 'publisher', wfMsg( 'aboutpage' ), $wgSitename );
-               $this->element( 'language', $wgContLanguageCode );
+               $this->element( 'language', $wgLanguageCode );
                $this->element( 'type', 'Text' );
                $this->element( 'format', 'text/html' );
                $this->element( 'identifier', $this->reallyFullUrl() );

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index fe73d8d..dc659a9 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1569,7 +1569,7 @@ class OutputPage {
         */
        public function output() {
                global $wgUser, $wgOutputEncoding, $wgRequest;
-               global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
+               global $wgLanguageCode, $wgDebugRedirects, $wgMimeType;
                global $wgUseAjax, $wgAjaxWatch;
                global $wgEnableMWSuggest, $wgUniversalEditButton;
                global $wgArticle;
@@ -1657,7 +1657,7 @@ class OutputPage {
                ob_start();
 
                $wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-               $wgRequest->response()->header( 'Content-language: ' . $wgContLanguageCode );
+               $wgRequest->response()->header( 'Content-language: ' . $wgLanguageCode );
 
                if ( $this->mArticleBodyOnly ) {
                        $this->out( $this->mBodytext );

diff --git a/includes/Preferences.php b/includes/Preferences.php
index e8a574b..abb3f5c 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -228,10 +228,10 @@ class Preferences {
                }
 
                // Language
-               global $wgContLanguageCode;
+               global $wgLanguageCode;
                $languages = Language::getLanguageNames( false );
-               if ( !array_key_exists( $wgContLanguageCode, $languages ) ) {
-                       $languages[$wgContLanguageCode] = $wgContLanguageCode;
+               if ( !array_key_exists( $wgLanguageCode, $languages ) ) {
+                       $languages[$wgLanguageCode] = $wgLanguageCode;
                }
                ksort( $languages );
 

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index a0971fc..15e86aa 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -532,10 +532,10 @@ class QueryPage {
        }
 
        function feedTitle() {
-               global $wgContLanguageCode, $wgSitename;
+               global $wgLanguageCode, $wgSitename;
                $page = SpecialPage::getPage( $this->getName() );
                $desc = $page->getDescription();
-               return "$wgSitename - $desc [$wgContLanguageCode]";
+               return "$wgSitename - $desc [$wgLanguageCode]";
        }
 
        function feedDesc() {

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index c6153f0..9cec48d 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -133,7 +133,7 @@ class SkinTemplate extends Skin {
         */
        function outputPage( OutputPage $out ) {
                global $wgArticle, $wgUser, $wgLang, $wgContLang;
-               global $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgScript, $wgStylePath, $wgLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
                global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
                global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
@@ -426,7 +426,7 @@ class SkinTemplate extends Skin {
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                global $wgBetterDirectionality;
                if ( $wgBetterDirectionality ) {
-                       $realBodyAttribs = array( 'lang' => $wgContLanguageCode, 'dir' => $wgContLang->getDir() );
+                       $realBodyAttribs = array( 'lang' => $wgLanguageCode, 'dir' => $wgContLang->getDir() );
                        $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
                }
                $out->mBodytext .= $printfooter . $this->generateDebugHTML();

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index d250af2..ae4ca4e 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -41,8 +41,8 @@ function wfStreamFile( $fname, $headers = array() ) {
                return;
        }
 
-       global $wgContLanguageCode;
-       header( "Content-Disposition: inline;filename*=utf-8'$wgContLanguageCode'" . urlencode( basename( $fname ) ) );
+       global $wgLanguageCode;
+       header( "Content-Disposition: inline;filename*=utf-8'$wgLanguageCode'" . urlencode( basename( $fname ) ) );
 
        foreach ( $headers as $header ) {
                header( $header );

diff --git a/includes/StubObject.php b/includes/StubObject.php
index fe28f91..ef2d973 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -122,8 +122,8 @@ class StubContLang extends StubObject {
        }
 
        function _newObject() {
-               global $wgContLanguageCode;
-               $obj = Language::factory( $wgContLanguageCode );
+               global $wgLanguageCode;
+               $obj = Language::factory( $wgLanguageCode );
                $obj->initEncoding();
                $obj->initContLang();
                return $obj;
@@ -146,7 +146,7 @@ class StubUserLang extends StubObject {
        }
 
        function _newObject() {
-               global $wgContLanguageCode, $wgRequest, $wgUser, $wgContLang;
+               global $wgLanguageCode, $wgRequest, $wgUser, $wgContLang;
                $code = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
                // BCP 47 - letter case MUST NOT carry meaning
                $code = strtolower( $code );
@@ -154,10 +154,10 @@ class StubUserLang extends StubObject {
                # Validate $code
                if( empty( $code ) || !preg_match( '/^[a-z-]+$/', $code ) || ( $code === 'qqq' ) ) {
                        wfDebug( "Invalid user language code\n" );
-                       $code = $wgContLanguageCode;
+                       $code = $wgLanguageCode;
                }
 
-               if( $code === $wgContLanguageCode ) {
+               if( $code === $wgLanguageCode ) {
                        return $wgContLang;
                } else {
                        $obj = Language::factory( $code );

diff --git a/includes/Xml.php b/includes/Xml.php
index 06385d3..4dfc9e6 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -214,14 +214,14 @@ class Xml {
         * @return array of label and select
         */
        public static function languageSelector( $selected, $customisedOnly = true ) {
-               global $wgContLanguageCode;
+               global $wgLanguageCode;
                /**
                 * Make sure the site language is in the list; a custom language code
                 * might not have a defined name...
                 */
                $languages = Language::getLanguageNames( $customisedOnly );
-               if( !array_key_exists( $wgContLanguageCode, $languages ) ) {
-                       $languages[$wgContLanguageCode] = $wgContLanguageCode;
+               if( !array_key_exists( $wgLanguageCode, $languages ) ) {
+                       $languages[$wgLanguageCode] = $wgLanguageCode;
                }
                ksort( $languages );
 
@@ -230,7 +230,7 @@ class Xml {
                 * Otherwise, no default is selected and the user ends up
                 * with an Afrikaans interface since it's first in the list.
                 */
-               $selected = isset( $languages[$selected] ) ? $selected : $wgContLanguageCode;
+               $selected = isset( $languages[$selected] ) ? $selected : $wgLanguageCode;
                $options = "\n";
                foreach( $languages as $code => $name ) {
                        $options .= Xml::option( "$code - $name", $code, ($code == $selected) ) . "\n";

diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php
index 097c4cc..c548588 100644 (file)
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -54,7 +54,7 @@ class ApiFeedWatchlist extends ApiBase {
         * Wrap the result as an RSS/Atom feed.
         */
        public function execute() {
-               global $wgFeedClasses, $wgFeedLimit, $wgSitename, $wgContLanguageCode;
+               global $wgFeedClasses, $wgFeedLimit, $wgSitename, $wgLanguageCode;
 
                try {
                        $params = $this->extractRequestParams();
@@ -102,7 +102,7 @@ class ApiFeedWatchlist extends ApiBase {
                                $feedItems[] = $this->createFeedItem( $info );
                        }
 
-                       $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgContLanguageCode . ']';
+                       $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgLanguageCode . ']';
                        $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullURL();
 
                        $feed = new $wgFeedClasses[$params['feedformat']] ( $feedTitle, htmlspecialchars( wfMsgForContent( 'watchlist' ) ), $feedUrl );
@@ -114,7 +114,7 @@ class ApiFeedWatchlist extends ApiBase {
                        // Error results should not be cached
                        $this->getMain()->setCacheMaxAge( 0 );
 
-                       $feedTitle = $wgSitename . ' - Error - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgContLanguageCode . ']';
+                       $feedTitle = $wgSitename . ' - Error - ' . wfMsgForContent( 'watchlist' ) . ' [' . $wgLanguageCode . ']';
                        $feedUrl = SpecialPage::getTitleFor( 'Watchlist' )->getFullURL();
 
                        $feedFormat = isset( $params['feedformat'] ) ? $params['feedformat'] : 'rss';

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index a98fc29..374ffb6 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2785,8 +2785,8 @@ class Parser {
                        case 'directionmark':
                                return $wgContLang->getDirMark();
                        case 'contentlanguage':
-                               global $wgContLanguageCode;
-                               return $wgContLanguageCode;
+                               global $wgLanguageCode;
+                               return $wgLanguageCode;
                        default:
                                $ret = null;
                                if ( wfRunHooks( 'ParserGetVariableValueSwitch', array( &$this, &$this->mVarCache, &$index, &$ret, &$frame ) ) ) {

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index a3be33f..f02f44f 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -428,10 +428,10 @@ class SpecialContributions extends SpecialPage {
        }
 
        protected function feedTitle() {
-               global $wgContLanguageCode, $wgSitename;
+               global $wgLanguageCode, $wgSitename;
                $page = SpecialPage::getPage( 'Contributions' );
                $desc = $page->getDescription();
-               return "$wgSitename - $desc [$wgContLanguageCode]";
+               return "$wgSitename - $desc [$wgLanguageCode]";
        }
 
        protected function feedItem( $row ) {

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 0b73939..d42aabd 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -374,10 +374,10 @@ class SpecialNewpages extends IncludableSpecialPage {
        }
 
        protected function feedTitle() {
-               global $wgContLanguageCode, $wgSitename;
+               global $wgLanguageCode, $wgSitename;
                $page = SpecialPage::getPage( 'Newpages' );
                $desc = $page->getDescription();
-               return "$wgSitename - $desc [$wgContLanguageCode]";
+               return "$wgSitename - $desc [$wgLanguageCode]";
        }
 
        protected function feedItem( $row ) {

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index b15af35..896d631 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -550,7 +550,6 @@ class ParserTest {
                        'wgSitename' => 'MediaWiki',
                        'wgServerName' => 'Britney-Spears',
                        'wgLanguageCode' => $lang,
-                       'wgContLanguageCode' => $lang,
                        'wgDBprefix' => $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_',
                        'wgRawHtml' => isset( $opts['rawhtml'] ),
                        'wgLang' => null,

diff --git a/maintenance/tests/MessageTest.php b/maintenance/tests/MessageTest.php
index 23a67bf..6c55802 100644 (file)
--- a/maintenance/tests/MessageTest.php
+++ b/maintenance/tests/MessageTest.php
@@ -3,9 +3,9 @@
 class MessageTest extends PHPUnit_Framework_TestCase {
 
        function setUp() {
-               global $wgContLanguageCode;
+               global $wgLanguageCode;
                
-               $wgContLanguageCode = 'en'; # For mainpage to be 'Main Page'
+               $wgLanguageCode = 'en'; # For mainpage to be 'Main Page'
        }
 
        function testExists() {