http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89966
Revision: 89966
Author: neilk
Date: 2011-06-13 14:30:01 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
for bytes function, avoid conflict with similar strings in core
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.i18n.php
trunk/extensions/UploadWizard/UploadWizardHooks.php
trunk/extensions/UploadWizard/resources/mw.units.js
Modified: trunk/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-06-13 14:22:01 UTC
(rev 89965)
+++ trunk/extensions/UploadWizard/UploadWizard.i18n.php 2011-06-13 14:30:01 UTC
(rev 89966)
@@ -268,7 +268,15 @@
'mwe-upwiz-feedback-adding' => 'Adding feedback to page...',
'mwe-upwiz-feedback-error1' => 'Error: Unrecognized result from API',
'mwe-upwiz-feedback-error2' => 'Error: Edit failed',
- 'mwe-upwiz-feedback-error3' => 'Error: No response from API'
+ 'mwe-upwiz-feedback-error3' => 'Error: No response from API',
+
+ // similar to mediawiki.special.upload.js
+ 'mwe-upwiz-size-terabytes' => '$1 TB',
+ 'mwe-upwiz-size-gigabytes' => '$1 GB',
+ 'mwe-upwiz-size-megabytes' => '$1 MB',
+ 'mwe-upwiz-size-kilobytes' => '$1 K',
+ 'mwe-upwiz-size-bytes' => '$1 bytes'
+
);
Modified: trunk/extensions/UploadWizard/UploadWizardHooks.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-06-13 14:22:01 UTC
(rev 89965)
+++ trunk/extensions/UploadWizard/UploadWizardHooks.php 2011-06-13 14:30:01 UTC
(rev 89966)
@@ -336,11 +336,11 @@
'mwe-upwiz-feedback-error1',
'mwe-upwiz-feedback-error2',
'mwe-upwiz-feedback-error3',
- 'size-terabytes',
- 'size-gigabytes',
- 'size-megabytes',
- 'size-kilobytes',
- 'size-bytes'
+ 'mwe-upwiz-size-terabytes',
+ 'mwe-upwiz-size-gigabytes',
+ 'mwe-upwiz-size-megabytes',
+ 'mwe-upwiz-size-kilobytes',
+ 'mwe-upwiz-size-bytes'
),
'group' => 'ext.uploadWizard'
),
Modified: trunk/extensions/UploadWizard/resources/mw.units.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.units.js 2011-06-13 14:22:01 UTC
(rev 89965)
+++ trunk/extensions/UploadWizard/resources/mw.units.js 2011-06-13 14:30:01 UTC
(rev 89966)
@@ -1,6 +1,12 @@
( function( mw ) {
- var scaleMsgKeys = [ 'size-bytes', 'size-kilobytes', 'size-megabytes',
'size-gigabytes', 'size-terabytes' ];
+ var scaleMsgKeys = [
+ 'mwe-upwiz-size-bytes',
+ 'mwe-upwiz-size-kilobytes',
+ 'mwe-upwiz-size-megabytes',
+ 'mwe-upwiz-size-gigabytes',
+ 'mwe-upwiz-size-terabytes'
+ ];
mw.units = {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
