Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89353
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 tests/phpunit/PageTranslationTaggingTest.php
M utils/MessageGroupStats.php
M utils/UserToggles.php
13 files changed, 24 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/53/89353/1
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 602b448..0da57f6 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -405,7 +405,7 @@
LanguageNames::LIST_MW
);
} else {
- $languages = Language::getLanguageNames( false );
+ $languages = Language::fetchLanguageName();
}
ksort( $languages );
diff --git a/TranslateUtils.php b/TranslateUtils.php
index 253680c..40c4669 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -205,7 +205,7 @@
LanguageNames::LIST_MW
);
} else {
- $languageNames = Language::getLanguageNames( false );
+ $languageNames = Language::fetchLanguageNames();
}
// Remove languages with deprecated codes (bug 35475)
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 3550cf0..abbac43 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 7d687f9..608b1b4 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 87d60f6..d254c0a 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -613,7 +613,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 ) {
@@ -765,7 +765,7 @@
return false;
}
- $codes = Language::getLanguageNames( false );
+ $codes = Language::fetchLanguageNames();
global $wgTranslateDocumentationLanguageCode;
unset( $codes[$wgTranslateDocumentationLanguageCode] );
diff --git a/tests/phpunit/PageTranslationTaggingTest.php
b/tests/phpunit/PageTranslationTaggingTest.php
index 57e71bc..f49c9d7 100644
--- a/tests/phpunit/PageTranslationTaggingTest.php
+++ b/tests/phpunit/PageTranslationTaggingTest.php
@@ -64,7 +64,17 @@
$translatablePage->addMarkedTag( $latest, array( 'foo' ) );
$this->assertSame( $latest, $translatablePage->getReadyTag(),
'Ready tag was added' );
$this->assertSame( $latest, $translatablePage->getMarkedTag(),
'Marked tag was added' );
+ // @todo FIXME: Deprecated! Needs a user to replace.
$page->updateRestrictions( array( 'edit' => 'sysop' ), 'Test
case' );
+ /*
+ $page->doUpdateRestrictions(
+ array( 'edit' => 'sysop' ),
+ array(), // expiry
+ false, // cascade allowed
+ 'Test case', // reason
+ $user // user
+ );
+ */
$newLatest = $latest + 1;
$this->assertSame(
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 301d443..dc152de 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',
@@ -109,7 +109,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: newchange
Gerrit-Change-Id: I0562a8c0f6cef0772ca05f47f893006663975a1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
