From 328eb017c806dd04c20dc310193b8377f509425f Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Thu, 14 Nov 2013 09:58:31 +0530
Subject: [PATCH] Json message loader clean up

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

Follow up: Ic39dec1c484982fb07edd167e83794c0b5f470ee

Change-Id: I13c64a5e89ac75be8a95d951658018a78534f466
---
 UniversalLanguageSelector.php                                | 2 +-
 api/ApiULSLocalization.php                                   | 2 +-
 includes/ResourceLoaderULSJsonMessageModule.php              | 4 ++--
 includes/{JsonMessageLoader.php => ULSJsonMessageLoader.php} | 2 +-
 resources/js/ext.uls.i18n.js                                 | 5 ++---
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename includes/{JsonMessageLoader.php => ULSJsonMessageLoader.php} (98%)

diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 1dbcd9c5..389ce9f2 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -170,7 +170,7 @@ $wgAutoloadClasses += array(
 		__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 ff96ce04..40be5132 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -32,7 +32,7 @@ class ApiULSLocalization extends ApiBase {
 		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 ca1c40fa..16e1c0c2 100644
--- a/includes/ResourceLoaderULSJsonMessageModule.php
+++ b/includes/ResourceLoaderULSJsonMessageModule.php
@@ -36,7 +36,7 @@ class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
 
 		$mtimes = array_map(
 			'filemtime',
-			JsonMessageLoader::getFilenames( $code )
+			ULSJsonMessageLoader::getFilenames( $code )
 		);
 		// Make sure we have at least one entry
 		$mtimes[] = 1;
@@ -56,7 +56,7 @@ class ResourceLoaderULSJsonMessageModule extends ResourceLoaderModule {
 			$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 0c509a65..856a5164 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 c9f51642..50f7f9fb 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();