http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96007
Revision: 96007
Author: nikerabbit
Date: 2011-09-01 16:11:35 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Migrate messages to resource loader
Modified Paths:
--------------
trunk/extensions/Translate/Translate.php
trunk/extensions/Translate/js/quickedit.js
trunk/extensions/Translate/utils/TranslationHelpers.php
Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php 2011-09-01 16:08:47 UTC (rev
96006)
+++ trunk/extensions/Translate/Translate.php 2011-09-01 16:11:35 UTC (rev
96007)
@@ -143,6 +143,7 @@
$wgResourceModules['ext.translate.quickedit'] = array(
'scripts' => 'js/quickedit.js',
'styles' => 'js/ext.translate.quickedit.css',
+ 'messages' => array( 'translate-js-nonext', 'translate-js-save-failed'
),
) + $resourcePaths;
$wgResourceModules['ext.translate.messagetable'] = array(
Modified: trunk/extensions/Translate/js/quickedit.js
===================================================================
--- trunk/extensions/Translate/js/quickedit.js 2011-09-01 16:08:47 UTC (rev
96006)
+++ trunk/extensions/Translate/js/quickedit.js 2011-09-01 16:11:35 UTC (rev
96007)
@@ -11,13 +11,11 @@
*
* TODO list:
* * On succesful save, update the MessageTable display too.
- * * Integrate the (new) edittoolbar
* * Autoload ui classes
* * Instead of hc'd onscript, give them a class and use necessary triggers
- * * Live-update the checks assistant
*
* @author Niklas Laxström
- * @copyright Copyright © 2009-2010 Niklas Laxström
+ * @copyright Copyright © 2009-2011 Niklas Laxström
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
2.0 or later
*/
@@ -152,11 +150,11 @@
if ( json.error ) {
alert( json.error.info + ' (' +
json.error.code +')' );
} else if ( json.edit.result === 'Failure' ) {
- alert( trlMsgSaveFailed );
+ alert( mw.msg(
'translate-js-save-failed' ) );
} else if ( json.edit.result === 'Success' ) {
dialog.dialog( 'close' );
} else {
- alert( trlMsgSaveFailed );
+ alert( mw.msg(
'translate-js-save-failed' ) );
}
}
} );
@@ -197,7 +195,7 @@
found = true;
}
}
- alert(trlMsgNoNext);
+ alert( mw.msg( 'translate-js-nonext' ) );
return;
}
Modified: trunk/extensions/Translate/utils/TranslationHelpers.php
===================================================================
--- trunk/extensions/Translate/utils/TranslationHelpers.php 2011-09-01
16:08:47 UTC (rev 96006)
+++ trunk/extensions/Translate/utils/TranslationHelpers.php 2011-09-01
16:11:35 UTC (rev 96007)
@@ -1213,13 +1213,6 @@
$out->addExtensionStyle( TranslateUtils::assetPath(
'js/base/custom-theme/jquery-ui-1.7.2.custom.css' ) );
}
- $vars = array(
- 'trlMsgNoNext' => wfMsg( 'translate-js-nonext' ),
- 'trlMsgSaveFailed' => wfMsg( 'translate-js-save-failed'
),
- );
-
- $out->addScript( Skin::makeVariablesScript( $vars ) );
-
// Might be needed, but ajax doesn't load it
// Globals :(
$diff = new DifferenceEngine;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
