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

Add ext.uls.messages as dependency for ext.uls.mediawiki

Browse Source 
Turns out the messages for language selector were not loading
in Special:MainPage. This fixes that as well as cleaning up the
dependencies.

Change-Id: Ice8dcf1b2e878a0fe3cd0e002a9b1cff2f1901dd
This commit is contained in:
Niklas Laxström
2014-01-25 00:52:37 +00:00
parent 219b222c34
commit 7c28df5125
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Resources.php
View File

@@ -201,14 +201,18 @@ $wgResourceModules['jquery.ime'] = array(
'styles' => 'lib/jquery.ime/css/jquery.ime.css', 'styles' => 'lib/jquery.ime/css/jquery.ime.css',
) + $resourcePaths; ) + $resourcePaths;
// A module that sets useful ULS default options // This module sets default options for the language selector that are
// suitable for MediaWiki and loads necessary dependencies like grid,
// messages and jquery.uls itself.
$wgResourceModules['ext.uls.mediawiki'] = array( $wgResourceModules['ext.uls.mediawiki'] = array(
'scripts' => 'resources/js/ext.uls.mediawiki.js', 'scripts' => 'resources/js/ext.uls.mediawiki.js',
'dependencies' => array( 'dependencies' => array(
'jquery.uls',
'mediawiki.util',
'ext.uls.init', 'ext.uls.init',
'ext.uls.languagenames', 'ext.uls.languagenames',
'ext.uls.messages',
'jquery.uls',
'jquery.uls.grid',
'mediawiki.util',
), ),
) + $resourcePaths; ) + $resourcePaths;

2
resources/js/ext.uls.interface.js
View File

@@ -421,7 +421,7 @@
mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' ); mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' );
} }
} else { } else {
mw.loader.using( ['ext.uls.mediawiki', 'jquery.uls.grid'], function () { mw.loader.using( 'ext.uls.mediawiki', function () {
$ulsTrigger.uls( { $ulsTrigger.uls( {
quickList: function () { quickList: function () {
return mw.uls.getFrequentLanguageList(); return mw.uls.getFrequentLanguageList();