wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update jquery.i18n to f6102aa4feddf3623c9fba3a3d31592c58204b58"

Browse source
This commit is contained in:
jenkins-bot 2013-12-13 21:34:08 +00:00 committed by Gerrit Code Review
parent 717f8acf47 21dd4e411a
commit 0a203fec65
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VisualEditor.hooks.php
View file

@ -471,7 +471,7 @@ class VisualEditorHooks {
$modules['jquery.i18n'] = $wgVisualEditorResourceTemplate + array(
'scripts' => array(
'jquery.i18n/src/jquery.i18n.js',
'jquery.i18n/src/jquery.i18n.messages.js',
'jquery.i18n/src/jquery.i18n.messagestore.js',
'jquery.i18n/src/jquery.i18n.parser.js',
'jquery.i18n/src/jquery.i18n.emitter.js',
'jquery.i18n/src/jquery.i18n.language.js',

9
modules/jquery.i18n/src/jquery.i18n.messages.js → modules/jquery.i18n/src/jquery.i18n.messagestore.js
View file

@ -83,12 +83,17 @@
},
/**
* Set messages
* Set messages to the given locale.
* If locale exists, add messages to the locale.
* @param locale
* @param messages
*/
set: function( locale, messages ) {
this.messages[locale] = messages;
if ( !this.messages[locale] ) {
this.messages[locale] = messages;
} else {
this.messages[locale] = $.extend( this.messages[locale], messages );
}
},
/**