had stict standards issues with setFakeSlaveLag() and setFakeMaster().
* (bug 451) Improve the phrase mappings of the Chinese converter arrays.
* (bug 12487) Rights log is not fully internationalized
+* (bug 10837) Language variants no longer override other languages than base
=== API changes in 1.13 ===
// if variant is explicitely selected, use it instead the one from wgUser
// see bug #7605
- if( $wgContLang->hasVariants() ){
+ if( $wgContLang->hasVariants() && $code == $wgContLanguageCode ){
$variant = $wgContLang->getPreferredVariant();
if( $variant != $wgContLanguageCode )
$code = $variant;
if($this->mPreferredVariant)
return $this->mPreferredVariant;
+ // figure out user lang without constructing wgLang to avoid infinite recursion
+ $userLang = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
+ // see if interface language is same as content, if not, prevent conversion
+ if( $this->mMainLanguageCode != $userLang ){
+ $this->mPreferredVariant = $this->mMainLanguageCode; // no conversion
+ return $this->mPreferredVariant;
+ }
+
// see if the preference is set in the request
$req = $wgRequest->getText( 'variant' );
if( in_array( $req, $this->mVariants ) ) {