jenkins-bot has submitted this change and it was merged.
Change subject: Use localized (in the UI language) language names in messages
......................................................................
Use localized (in the UI language) language names in messages
The word "native" was misleading. I turned it around. My definition
of "native" is: the name of a language in that language.
This patch changes all remaining messages like "please enter a
label in Deutsch" to "please enter a label in German".
The language selector and the language names in the term box are
untouched (still the "native" language names).
Change-Id: Icad1f9e30b61fdaf33710dc50577d8e456ad0dab
---
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/wikibase.js
3 files changed, 18 insertions(+), 20 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
index 8cdb1fa..7fccede 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
@@ -133,7 +133,7 @@
// TODO: Inject correct placeholder via options
placeholder: mw.msg(
'wikibase-description-edit-placeholder-language-aware',
- wb.getNativeLanguageNameByCode( languageCode )
+ wb.getLanguageNameByCode( languageCode )
),
dir: dir
} )
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
index caf498b..f0f89ed 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
@@ -148,7 +148,7 @@
// TODO: Inject correct placeholder via options
placeholder: mw.msg(
'wikibase-label-edit-placeholder-language-aware',
- wb.getNativeLanguageNameByCode( languageCode )
+ wb.getLanguageNameByCode( languageCode )
),
dir: dir
} )
diff --git a/lib/resources/wikibase.js b/lib/resources/wikibase.js
index 432e898..709750b 100644
--- a/lib/resources/wikibase.js
+++ b/lib/resources/wikibase.js
@@ -24,33 +24,31 @@
* @return {Object} Set of languages (empty object when ULS is not
available)
*/
wb.getLanguages = function() {
- return ( $.uls !== undefined ) ? $.uls.data.languages : {};
+ return $.uls && $.uls.data.languages || {};
};
/**
- * Returns the name of a language by its language code. If the language
code is unknown or ULS
- * can not provide sufficient language information, the language code
is returned.
+ * Returns the name of a language in that language, if available
(currently requires ULS).
+ * Falls back to the language code.
+ *
+ * @param {string} langCode
+ * @return string
+ */
+ wb.getNativeLanguageName = function( langCode ) {
+ var language = wb.getLanguages()[ langCode ];
+ return language && language[2] || langCode;
+ };
+
+ /**
+ * Returns the name of a language in the UI language, if available
(currently requires ULS).
+ * Falls back to getNativeLanguageName, which may fall back to the
language code.
*
* @param {string} langCode
* @return string
*/
wb.getLanguageNameByCode = function( langCode ) {
- var language = wb.getLanguages()[ langCode ];
- if( language && language[2] ) {
- return language[2];
- }
- return langCode;
- };
-
- /**
- * Same getLanguageNameByCode but on user UI native language instead,
fallbacks
- * to getLanguageNameByCode in cases native translation wasn't available
- */
- wb.getNativeLanguageNameByCode = function( langCode ) {
var ulsLanguages = mw.config.get( 'wgULSLanguages' );
- return ( ulsLanguages && ulsLanguages[langCode] ) ?
- ulsLanguages[langCode] :
- wb.getLanguageNameByCode( langCode );
+ return ulsLanguages && ulsLanguages[langCode] ||
wb.getNativeLanguageName( langCode );
};
} )( wikibase, mediaWiki, jQuery );
--
To view, visit https://gerrit.wikimedia.org/r/167799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icad1f9e30b61fdaf33710dc50577d8e456ad0dab
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Ebrahim <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
