jenkins-bot has submitted this change and it was merged.
Change subject: Remove some pre-1.20 compatibility
......................................................................
Remove some pre-1.20 compatibility
Change-Id: I0562a8c0f6cef0772ca05f47f893006663975a1e
---
M TranslateHooks.php
M TranslateUtils.php
M api/ApiGroupReview.php
M specials/SpecialLanguageStats.php
M specials/SpecialMessageGroupStats.php
M specials/SpecialMyLanguage.php
M specials/SpecialSupportedLanguages.php
M specials/SpecialTranslationStats.php
M tag/SpecialPageTranslation.php
M tag/TranslatablePage.php
M utils/MessageGroupStats.php
M utils/UserToggles.php
12 files changed, 14 insertions(+), 24 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 76f9e6f..52285e5 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -394,7 +394,7 @@
LanguageNames::LIST_MW
);
} else {
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageName();
}
ksort( $languages );
diff --git a/TranslateUtils.php b/TranslateUtils.php
index e6b77ce..89d8358 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -197,16 +197,7 @@
* @return array ( language code => language name )
*/
public static function getLanguageNames( /*string */$code ) {
- if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) )
{
- $languageNames = Language::fetchLanguageNames( $code,
'mw' ); // since 1.20
- } elseif ( is_callable( array( 'LanguageNames', 'getNames' ) )
) {
- $languageNames = LanguageNames::getNames( $code,
- LanguageNames::FALLBACK_NORMAL,
- LanguageNames::LIST_MW
- );
- } else {
- $languageNames = Language::getLanguageNames( false );
- }
+ $languageNames = Language::fetchLanguageNames( $code );
// Remove languages with deprecated codes (bug 35475)
global $wgDummyLanguageCodes;
diff --git a/api/ApiGroupReview.php b/api/ApiGroupReview.php
index ab411d2..e114181 100644
--- a/api/ApiGroupReview.php
+++ b/api/ApiGroupReview.php
@@ -37,7 +37,7 @@
$requestParams = $this->extractRequestParams();
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageNames();
if ( !isset( $languages[$code] ) ) {
$this->dieUsageMsg( array( 'missingparam', 'language' )
);
}
diff --git a/specials/SpecialLanguageStats.php
b/specials/SpecialLanguageStats.php
index 60b5a30..70923fd 100644
--- a/specials/SpecialLanguageStats.php
+++ b/specials/SpecialLanguageStats.php
@@ -172,7 +172,7 @@
* @return array
*/
protected function isValidValue( $value ) {
- $langs = Language::getLanguageNames( false );
+ $langs = Language::fetchLanguageNames();
return isset( $langs[$value] );
}
diff --git a/specials/SpecialMessageGroupStats.php
b/specials/SpecialMessageGroupStats.php
index 61b3897..766ba79 100644
--- a/specials/SpecialMessageGroupStats.php
+++ b/specials/SpecialMessageGroupStats.php
@@ -155,7 +155,7 @@
MessageGroupStats::setTimeLimit( $this->timelimit );
$cache = MessageGroupStats::forGroup( $this->target );
- $languages = array_keys( Language::getLanguageNames( false ) );
+ $languages = array_keys( Language::fetchLanguageNames() );
sort( $languages );
$this->filterPriorityLangs( $languages, $this->target, $cache );
foreach ( $languages as $code ) {
diff --git a/specials/SpecialMyLanguage.php b/specials/SpecialMyLanguage.php
index e6f16ce..a6213bd 100644
--- a/specials/SpecialMyLanguage.php
+++ b/specials/SpecialMyLanguage.php
@@ -51,7 +51,7 @@
$pos = strrpos( $par, '/' );
$basepage = substr( $par, 0, $pos );
$code = substr( $par, $pos + 1 );
- $codes = Language::getLanguageNames( false );
+ $codes = Language::fetchLanguageNames();
if ( isset( $codes[$code] ) ) {
$base = Title::newFromText( $basepage );
}
diff --git a/specials/SpecialSupportedLanguages.php
b/specials/SpecialSupportedLanguages.php
index 32c11df..a1c6b2c 100644
--- a/specials/SpecialSupportedLanguages.php
+++ b/specials/SpecialSupportedLanguages.php
@@ -80,7 +80,7 @@
);
}
- $natives = Language::getLanguageNames( false );
+ $natives = Language::fetchLanguageNames();
ksort( $natives );
$this->outputLanguageCloud( $natives );
diff --git a/specials/SpecialTranslationStats.php
b/specials/SpecialTranslationStats.php
index a679bb2..884d768 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -304,7 +304,7 @@
LanguageNames::LIST_MW_AND_CLDR
);
} else {
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageNames();
}
ksort( $languages );
diff --git a/tag/SpecialPageTranslation.php b/tag/SpecialPageTranslation.php
index 9311c4a..7898220 100644
--- a/tag/SpecialPageTranslation.php
+++ b/tag/SpecialPageTranslation.php
@@ -747,7 +747,7 @@
$npLangs = array_map( 'trim', explode( ',', $npLangs ) );
$npLangs = array_unique( $npLangs );
// Remove invalid language codes.
- $languages = Language::getLanguageNames();
+ $languages = Language::fetchLanguageNames();
foreach ( $npLangs as $index => $language ) {
if ( !array_key_exists( $language, $languages ) ) {
unset( $npLangs[$index] );
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index c612c7f..a6db4ea 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -614,7 +614,7 @@
$filtered = array();
// Make sure we only get translation subpages while ignoring
others
- $codes = Language::getLanguageNames( false );
+ $codes = Language::fetchLanguageNames();
$prefix = $this->getTitle()->getText();
/** @var Title $title */
foreach ( $titles as $title ) {
@@ -766,7 +766,7 @@
return false;
}
- $codes = Language::getLanguageNames( false );
+ $codes = Language::fetchLanguageNames();
global $wgTranslateDocumentationLanguageCode;
unset( $codes[$wgTranslateDocumentationLanguageCode] );
diff --git a/utils/MessageGroupStats.php b/utils/MessageGroupStats.php
index ac0c445..d84fb7d 100644
--- a/utils/MessageGroupStats.php
+++ b/utils/MessageGroupStats.php
@@ -271,7 +271,7 @@
$stats = self::extractResults( $res, $stats );
# Go over each language filling missing entries
- $languages = array_keys( Language::getLanguageNames( false ) );
+ $languages = array_keys( Language::fetchLanguageNames() );
// This is for calculating things in correct order
sort( $languages );
foreach ( $languages as $code ) {
@@ -388,7 +388,6 @@
global $wgTranslateDocumentationLanguageCode;
# Calculate if missing and store in the db
$collection = $group->initCollection( $code );
- $collection->setReviewMode( true );
if ( $code === $wgTranslateDocumentationLanguageCode ) {
$ffs = $group->getFFS();
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 0353744..030a302 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
@@ -65,7 +65,7 @@
// Set target ID.
$select->setTargetId( 'mw-input-translate-editlangs' );
// Get available languages.
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageNames();
$preferences['translate-editlangs'] = array(
'class' => 'HTMLJsSelectToInputField',
@@ -91,7 +91,7 @@
LanguageNames::FALLBACK_NORMAL
);
} else {
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageNames();
}
ksort( $languages );
--
To view, visit https://gerrit.wikimedia.org/r/89353
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0562a8c0f6cef0772ca05f47f893006663975a1e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: KartikMistry <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: SuchetaG <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
