bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Json message loader clean up

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

Follow up: Ic39dec1c484982fb07edd167e83794c0b5f470ee

Change-Id: I13c64a5e89ac75be8a95d951658018a78534f466
This commit is contained in:
Santhosh Thottingal
2013-11-14 09:58:31 +05:30
committed by Nikerabbit
parent 8b95807054
commit 328eb017c8
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UniversalLanguageSelector.php
View File

@@ -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',
);

2
api/ApiULSLocalization.php
View File

@@ -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' );

4
includes/ResourceLoaderULSJsonMessageModule.php
View File

@@ -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 );
}

2
includes/JsonMessageLoader.php → includes/ULSJsonMessageLoader.php
View File

@@ -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.

5
resources/js/ext.uls.i18n.js
View File

@@ -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();