Merge "ResourceLoader Module for serving json based localization messages"

resources/js/ext.uls.i18n.js

@@ -34,10 +34,22 @@
 	// ApiULSLocalization handles fallback in ULS
 	$.i18n.fallbacks = {};
 
-	mw.uls.loadLocalization = function ( locale ) {
+	/**
+	 * Load localization messags for a locale to the jquery.i18n
+	 * messagestore.
+	 * Also called by RL module ResourceLoaderULSJsonMessageModule
+	 * @param {string} locale the language code
+	 * @param {Object} [messages]
+	 * @return {jQuery.Deferred}
+	 */
+	mw.uls.loadLocalization = function ( locale, messages ) {
 		var i18n = $.i18n();
 
 		i18n.locale = locale;
+		if ( messages ) {
+			i18n.load( messages, locale );
+			return $.Deferred().resolve();
+		}
 		if ( i18n.messageStore.messages[locale] ) {
 			return $.Deferred().resolve();
 		}