[MediaWiki-commits] [Gerrit] Json message loader clean up - change (mediawiki...UniversalLanguageSelector)

[Santhosh (Code Review)]

Santhosh has uploaded a new change for review.

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


Change subject: Json message loader clean up
......................................................................

Json message loader clean up

* Rename JsonMessageLoader to ULSJsonMessageLoader
* Correct the return type of mw.uls.loadLocalization

Follow up: Ic39dec1c484982fb07edd167e83794c0b5f470ee

Change-Id: I13c64a5e89ac75be8a95d951658018a78534f466
---
M UniversalLanguageSelector.php
M api/ApiULSLocalization.php
M includes/ResourceLoaderULSJsonMessageModule.php
R includes/ULSJsonMessageLoader.php
M resources/js/ext.uls.i18n.js
5 files changed, 7 insertions(+), 8 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/24/95324/1

diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 1dbcd9c..389ce9f 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -170,7 +170,7 @@
                __DIR__ . '/includes/ResourceLoaderULSJsonMessageModule.php',
        'ApiLanguageSearch' => __DIR__ . '/api/ApiLanguageSearch.php',
        'ApiULSLocalization' => __DIR__ . '/api/ApiULSLocalization.php',
-       'JsonMessageLoader' => __DIR__ . '/includes/JsonMessageLoader.php',
+       'ULSJsonMessageLoader' => __DIR__ . 
'/includes/ULSJsonMessageLoader.php',
        'LanguageNameSearch' => __DIR__ . '/data/LanguageNameSearch.php',
 );
 
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index ff96ce0..40be513 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -32,7 +32,7 @@
                if ( !Language::isValidCode( $language ) ) {
                        $this->dieUsage( 'Invalid language', 'invalidlanguage' 
);
                }
-               $contents = JsonMessageLoader::getMessages( $language );
+               $contents = ULSJsonMessageLoader::getMessages( $language );
                // Output the file's contents raw
                $this->getResult()->addValue( null, 'text', json_encode( 
$contents ) );
                $this->getResult()->addValue( null, 'mime', 'application/json' 
);
diff --git a/includes/ResourceLoaderULSJsonMessageModule.php 
b/includes/ResourceLoaderULSJsonMessageModule.php
index ca1c40f..16e1c0c 100644
--- a/includes/ResourceLoaderULSJsonMessageModule.php
+++ b/includes/ResourceLoaderULSJsonMessageModule.php
@@ -36,7 +36,7 @@
 
                $mtimes = array_map(
                        'filemtime',
-                       JsonMessageLoader::getFilenames( $code )
+                       ULSJsonMessageLoader::getFilenames( $code )
                );
                // Make sure we have at least one entry
                $mtimes[] = 1;
@@ -56,7 +56,7 @@
                        $code = 'en';
                }
 
-               $params = array( $code, JsonMessageLoader::getMessages( $code ) 
);
+               $params = array( $code, ULSJsonMessageLoader::getMessages( 
$code ) );
 
                return Xml::encodeJsCall( 'mw.uls.loadLocalization', $params );
        }
diff --git a/includes/JsonMessageLoader.php b/includes/ULSJsonMessageLoader.php
similarity index 98%
rename from includes/JsonMessageLoader.php
rename to includes/ULSJsonMessageLoader.php
index 0c509a6..856a516 100644
--- a/includes/JsonMessageLoader.php
+++ b/includes/ULSJsonMessageLoader.php
@@ -19,7 +19,7 @@
  * @since 2013.11
  */
 
-class JsonMessageLoader {
+class ULSJsonMessageLoader {
        /**
         * Returns all message files that are used to load messages for the 
given
         * language.
diff --git a/resources/js/ext.uls.i18n.js b/resources/js/ext.uls.i18n.js
index c9f5164..50f7f9f 100644
--- a/resources/js/ext.uls.i18n.js
+++ b/resources/js/ext.uls.i18n.js
@@ -40,15 +40,14 @@
         * Also called by RL module ResourceLoaderULSJsonMessageModule
         * @param {string} locale the language code
         * @param {Object} [messages]
-        * @return {jQuery.Deferred}
+        * @return {jQuery.Promise}
         */
        mw.uls.loadLocalization = function ( locale, messages ) {
                var i18n = $.i18n();
 
                i18n.locale = locale;
                if ( messages ) {
-                       i18n.load( messages, locale );
-                       return $.Deferred().resolve();
+                       return i18n.load( messages, locale );
                }
                if ( i18n.messageStore.messages[locale] ) {
                        return $.Deferred().resolve();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I13c64a5e89ac75be8a95d951658018a78534f466
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>

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