Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56147
Change subject: Remove second parameter from TranslateUtils::getLanguageName()
......................................................................
Remove second parameter from TranslateUtils::getLanguageName()
Was marked as a code path to be deprecated. Also checked TranslateSVG,
TranslationNotifications and CentralNotice for possible usages.
Change-Id: Icf216db16f46c4d6c4cc9862814397e43f3b310f
---
M TranslateEditAddons.php
M TranslateUtils.php
M ffs/DtdFFS.php
M ffs/FlatPhpFFS.php
M ffs/GettextFFS.php
M ffs/JavaFFS.php
M ffs/JavaScriptFFS.php
M ffs/MediaWikiExtensionFFS.php
M ffs/Simple.php
M ffs/YamlFFS.php
M specials/SpecialLanguageStats.php
M specials/SpecialSearchTranslations.php
M specials/SpecialTranslationStats.php
M specials/SpecialTranslations.php
M tag/PageTranslationHooks.php
M tag/PageTranslationLogFormatter.php
M utils/MessageWebImporter.php
M utils/TranslateLogFormatter.php
M utils/TranslationHelpers.php
19 files changed, 21 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/47/56147/1
diff --git a/TranslateEditAddons.php b/TranslateEditAddons.php
index 5c59f7f..44874cb 100644
--- a/TranslateEditAddons.php
+++ b/TranslateEditAddons.php
@@ -203,7 +203,7 @@
if ( $handle->isDoc() ) {
$langCode = $context->getLanguage()->getCode();
- $name = TranslateUtils::getLanguageName(
$handle->getCode(), false, $langCode );
+ $name = TranslateUtils::getLanguageName(
$handle->getCode(), $langCode );
$accessKey = $context->msg( 'accesskey-save' )->plain();
$temp = array(
'id' => 'wpSave',
diff --git a/TranslateUtils.php b/TranslateUtils.php
index f655dc3..b4ce2f3 100644
--- a/TranslateUtils.php
+++ b/TranslateUtils.php
@@ -138,17 +138,11 @@
/**
* Returns a localised language name.
* @param string $code Language code.
- * @param bool|string $native Use only native names.
* @param string $language Language code of language the the name
should be in.
* @return string Best-effort localisation of wanted language name.
*/
- public static function getLanguageName( $code, $native = false,
$language = 'en' ) {
- if ( $native ) {
- // TODO: deprecate this code path
- $languages = Language::getLanguageNames( false );
- } else {
- $languages = TranslateUtils::getLanguageNames(
$language );
- }
+ public static function getLanguageName( $code, $language = 'en' ) {
+ $languages = TranslateUtils::getLanguageNames( $language );
if ( isset( $languages[$code] ) ) {
return $languages[$code];
diff --git a/ffs/DtdFFS.php b/ffs/DtdFFS.php
index 6c73720..e437f73 100644
--- a/ffs/DtdFFS.php
+++ b/ffs/DtdFFS.php
@@ -85,7 +85,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$output = "# Messages for $name ($native)\n";
$output .= "# Exported from $wgSitename\n\n";
diff --git a/ffs/FlatPhpFFS.php b/ffs/FlatPhpFFS.php
index 5d47bc8..75852e4 100644
--- a/ffs/FlatPhpFFS.php
+++ b/ffs/FlatPhpFFS.php
@@ -84,7 +84,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
if ( $wgTranslateDocumentationLanguageCode ) {
$docu = "\n * See the
$wgTranslateDocumentationLanguageCode 'language' for message documentation
incl. usage of parameters";
diff --git a/ffs/GettextFFS.php b/ffs/GettextFFS.php
index 5e1b07f..bcdda15 100644
--- a/ffs/GettextFFS.php
+++ b/ffs/GettextFFS.php
@@ -376,7 +376,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$authors = $this->doAuthors( $collection );
if ( isset( $this->extra['header'] ) ) {
$extra = "# --\n" . $this->extra['header'];
diff --git a/ffs/JavaFFS.php b/ffs/JavaFFS.php
index f291a28..140c6f8 100644
--- a/ffs/JavaFFS.php
+++ b/ffs/JavaFFS.php
@@ -216,7 +216,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true
);
+ $native = TranslateUtils::getLanguageName( $code, $code
);
$output = "# Messages for $name ($native)\n";
$output .= "# Exported from $wgSitename\n";
}
diff --git a/ffs/JavaScriptFFS.php b/ffs/JavaScriptFFS.php
index 3a2725c..2151cfc 100644
--- a/ffs/JavaScriptFFS.php
+++ b/ffs/JavaScriptFFS.php
@@ -249,7 +249,7 @@
global $wgSitename;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$authorsList = $this->authorsList( $authors );
/** @cond doxygen_bug */
diff --git a/ffs/MediaWikiExtensionFFS.php b/ffs/MediaWikiExtensionFFS.php
index b5ccb62..a7189f4 100644
--- a/ffs/MediaWikiExtensionFFS.php
+++ b/ffs/MediaWikiExtensionFFS.php
@@ -150,7 +150,7 @@
// And putting all together
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$section = <<<PHP
/** $name ($native)$authorList
diff --git a/ffs/Simple.php b/ffs/Simple.php
index f88c31f..70b26d7 100644
--- a/ffs/Simple.php
+++ b/ffs/Simple.php
@@ -300,7 +300,7 @@
protected function getLanguageNames( $code ) {
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
return array( $name, $native );
}
diff --git a/ffs/YamlFFS.php b/ffs/YamlFFS.php
index 0ced325..8d663f3 100644
--- a/ffs/YamlFFS.php
+++ b/ffs/YamlFFS.php
@@ -90,7 +90,7 @@
$code = $collection->code;
$name = TranslateUtils::getLanguageName( $code );
- $native = TranslateUtils::getLanguageName( $code, true );
+ $native = TranslateUtils::getLanguageName( $code, $code );
$output = "# Messages for $name ($native)\n";
$output .= "# Exported from $wgSitename\n";
diff --git a/specials/SpecialLanguageStats.php
b/specials/SpecialLanguageStats.php
index 206326b..6554bcc 100644
--- a/specials/SpecialLanguageStats.php
+++ b/specials/SpecialLanguageStats.php
@@ -235,7 +235,7 @@
* Output something helpful to guide the confused user.
*/
protected function outputIntroduction() {
- $languageName = TranslateUtils::getLanguageName( $this->target,
false, $this->getLanguage()->getCode() );
+ $languageName = TranslateUtils::getLanguageName( $this->target,
$this->getLanguage()->getCode() );
$rcInLangLink = Linker::link(
SpecialPage::getTitleFor( 'Translate', '!recent' ),
$this->msg( 'languagestats-recenttranslations'
)->escaped(),
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index 2873a84..80a1d59 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -220,7 +220,7 @@
$nondefaults['language'] = $key;
}
- $text = TranslateUtils::getLanguageName( $key, false,
$this->getLanguage()->getCode() );
+ $text = TranslateUtils::getLanguageName( $key,
$this->getLanguage()->getCode() );
$url = $this->getTitle()->getLocalUrl( $nondefaults );
$link = Html::element( 'a', array( 'href' => $url ),
$text );
$name = Html::rawElement( 'span', array( 'class' =>
'facet-name' ), $link );
diff --git a/specials/SpecialTranslationStats.php
b/specials/SpecialTranslationStats.php
index 0b2ff4f..a1a84cc 100644
--- a/specials/SpecialTranslationStats.php
+++ b/specials/SpecialTranslationStats.php
@@ -481,12 +481,12 @@
}
list( $groupId, $code ) = explode( '@', $label, 2 );
if ( $code && $groupId ) {
- $code = TranslateUtils::getLanguageName( $code,
false, $lang->getCode() ) . " ($code)";
+ $code = TranslateUtils::getLanguageName( $code,
$lang->getCode() ) . " ($code)";
$group = MessageGroups::getGroup( $groupId );
$group = $group ? $group->getLabel() : $groupId;
$label = "$group @ $code";
} elseif ( $code ) {
- $label = TranslateUtils::getLanguageName(
$code, false, $lang->getCode() ) . " ($code)";
+ $label = TranslateUtils::getLanguageName(
$code, $lang->getCode() ) . " ($code)";
} elseif ( $groupId ) {
$group = MessageGroups::getGroup( $groupId );
$label = $group ? $group->getLabel() : $groupId;
diff --git a/specials/SpecialTranslations.php b/specials/SpecialTranslations.php
index a082bcc..55e5917 100644
--- a/specials/SpecialTranslations.php
+++ b/specials/SpecialTranslations.php
@@ -200,7 +200,7 @@
$code = $tHandle->getCode();
- $text = TranslateUtils::getLanguageName( $code, false,
$this->getLanguage()->getCode() );
+ $text = TranslateUtils::getLanguageName( $code,
$this->getLanguage()->getCode() );
$text .= $separator;
$text .= $this->msg( 'parentheses' )->params( $code
)->plain();
$text = htmlspecialchars( $text );
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 9fbf597..a85cb25 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -226,7 +226,7 @@
$languages = array();
foreach ( $status as $code => $percent ) {
- $name = TranslateUtils::getLanguageName( $code, false,
$userLangCode );
+ $name = TranslateUtils::getLanguageName( $code,
$userLangCode );
$name = htmlspecialchars( $name ); // Unlikely, but
better safe
/* Percentages are too accurate and take more
diff --git a/tag/PageTranslationLogFormatter.php
b/tag/PageTranslationLogFormatter.php
index 24ca87b..2adde84 100644
--- a/tag/PageTranslationLogFormatter.php
+++ b/tag/PageTranslationLogFormatter.php
@@ -48,7 +48,7 @@
$languages = array_map( 'trim',
preg_split( '/,/', $languages, -1, PREG_SPLIT_NO_EMPTY ) );
$languages = array_map( function (
$code ) use ( $lang ) {
- return
TranslateUtils::getLanguageName( $code, false, $lang->getCode() );
+ return
TranslateUtils::getLanguageName( $code, $lang->getCode() );
}, $languages );
$params[4] = $lang->listToText(
$languages );
diff --git a/utils/MessageWebImporter.php b/utils/MessageWebImporter.php
index d81689c..7cf45a0 100644
--- a/utils/MessageWebImporter.php
+++ b/utils/MessageWebImporter.php
@@ -317,7 +317,7 @@
if ( $code === 'en' ) {
$this->out->addWikiMsg(
'translate-manage-intro-en' );
} else {
- $lang =
TranslateUtils::getLanguageName( $code, false, $wgLang->getCode() );
+ $lang =
TranslateUtils::getLanguageName( $code, $wgLang->getCode() );
$this->out->addWikiMsg(
'translate-manage-intro-other', $lang );
}
$this->out->addHTML( Html::hidden( 'language',
$code ) );
diff --git a/utils/TranslateLogFormatter.php b/utils/TranslateLogFormatter.php
index e38ab17..c6f3c9e 100644
--- a/utils/TranslateLogFormatter.php
+++ b/utils/TranslateLogFormatter.php
@@ -44,7 +44,7 @@
);
$params[2] = Message::rawParam( $targetPage );
- $params[3] = TranslateUtils::getLanguageName(
$language, false, $uiLanguage->getCode() );
+ $params[3] = TranslateUtils::getLanguageName(
$language, $uiLanguage->getCode() );
$params[5] = $this->formatStateMessage( $params[5] );
$params[6] = $this->formatStateMessage( $params[6] );
diff --git a/utils/TranslationHelpers.php b/utils/TranslationHelpers.php
index 079b767..ffa3ef1 100644
--- a/utils/TranslationHelpers.php
+++ b/utils/TranslationHelpers.php
@@ -879,7 +879,7 @@
}
$label =
- TranslateUtils::getLanguageName( $fbcode,
false, $wgLang->getCode() ) .
+ TranslateUtils::getLanguageName( $fbcode,
$wgLang->getCode() ) .
wfMessage( 'word-separator' )->text() .
wfMessage( 'parentheses', wfBCP47(
$fbcode ) )->text();
--
To view, visit https://gerrit.wikimedia.org/r/56147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf216db16f46c4d6c4cc9862814397e43f3b310f
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
