jenkins-bot has submitted this change and it was merged. Change subject: Don't fiddle with $wgLanguageCode in KkConverter ......................................................................
Don't fiddle with $wgLanguageCode in KkConverter This was causing problems with the setlang= and uselang= parameters in the URL being ignored on kkwiki. Bug: 64440 Change-Id: I4e2a20c707fd4b9b8a581a9d14e04b6cfc8b4b5c --- M RELEASE-NOTES-1.25 M languages/classes/LanguageKk.php 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index b649c2b..7ab8772 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -150,6 +150,9 @@ regularly. Below only new and removed languages are listed, as well as changes to languages because of Bugzilla reports. +* (bug 64440) Kazakh (kk) wikis should no longer forcefully reset the user's + interface language to kk where unexpected. + === Other changes in 1.25 === * The skin autodiscovery mechanism, deprecated in MediaWiki 1.23, has been removed. See https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery for diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index 1a09818..39e62f5 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -279,27 +279,22 @@ * @return string */ function translate( $text, $toVariant ) { - global $wgLanguageCode; $text = parent::translate( $text, $toVariant ); switch ( $toVariant ) { case 'kk-cyrl': case 'kk-kz': $letters = KK_L_UC . KK_L_LC . 'ʺʹ#0123456789'; - $wgLanguageCode = 'kk'; break; case 'kk-latn': case 'kk-tr': $letters = KK_C_UC . KK_C_LC . '№0123456789'; - $wgLanguageCode = 'kk-Latn'; break; case 'kk-arab': case 'kk-cn': $letters = KK_C_UC . KK_C_LC . /*KK_L_UC.KK_L_LC.'ʺʹ'.*/',;\?%\*№0123456789'; - $wgLanguageCode = 'kk-Arab'; break; default: - $wgLanguageCode = 'kk'; return $text; } // disable conversion variables like $1, $2... -- To view, visit https://gerrit.wikimedia.org/r/172020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e2a20c707fd4b9b8a581a9d14e04b6cfc8b4b5c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TTO <[email protected]> Gerrit-Reviewer: Greg Grossmeier <[email protected]> Gerrit-Reviewer: Nemo bis <[email protected]> Gerrit-Reviewer: Nikerabbit <[email protected]> Gerrit-Reviewer: Raimond Spekking <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: TTO <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
