Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/154020

Change subject: Fall back to language code in wikibase.getLanguageNameByCode()
......................................................................

Fall back to language code in wikibase.getLanguageNameByCode()

wikibase.getLanguageNameByCode() is used to fill messages. If ULS is not loaded,
those messages would contain en empty string.

Change-Id: I156e29d1a1a02e20461146c581608f66cff6d337
---
M lib/resources/wikibase.js
M lib/tests/qunit/wikibase.tests.js
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/20/154020/1

diff --git a/lib/resources/wikibase.js b/lib/resources/wikibase.js
index bc59067..0aa73c5 100644
--- a/lib/resources/wikibase.js
+++ b/lib/resources/wikibase.js
@@ -89,7 +89,7 @@
 
        /**
         * Returns the name of a language by its language code. If the language 
code is unknown or ULS
-        * can not provide sufficient language information, then an empty 
string will be returned.
+        * can not provide sufficient language information, the language code 
is returned.
         *
         * @param {string} langCode
         * @return string
@@ -99,7 +99,7 @@
                if( language && language[2] ) {
                        return language[2];
                }
-               return '';
+               return langCode;
        };
 
        this._proxyToWbSites = function( fnName ) {
diff --git a/lib/tests/qunit/wikibase.tests.js 
b/lib/tests/qunit/wikibase.tests.js
index c4e0d4b..64a54fd 100644
--- a/lib/tests/qunit/wikibase.tests.js
+++ b/lib/tests/qunit/wikibase.tests.js
@@ -39,20 +39,20 @@
                        assert.strictEqual(
                                wb.getLanguageNameByCode( 'de' ),
                                'Deutsch',
-                               'getLanguageNameByCode returns language name'
+                               'getLanguageNameByCode() returns language name.'
                        );
                } else {
                        assert.strictEqual(
                                wb.getLanguageNameByCode( 'de' ),
-                               '',
-                               'getLanguageNameByCode returns empty string 
(ULS not loaded)'
+                               'de',
+                               'getLanguageNameByCode() returns language code 
(ULS not loaded).'
                        );
                }
 
                assert.strictEqual(
                        wb.getLanguageNameByCode( 'nonexistantlanguagecode' ),
-                       '',
-                       'getLanguageNameByCode returns empty string if unknown 
code'
+                       'nonexistantlanguagecode',
+                       'getLanguageNameByCode() returns language code if 
unknown code.'
                );
        } );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/154020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I156e29d1a1a02e20461146c581608f66cff6d337
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to