r89966 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89965‎ | r89966 | r89967 >
Date:14:30, 13 June 2011
Author:neilk
Status:resolved (Comments)
Tags:
Comment:
for bytes function, avoid conflict with similar strings in core
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.i18n.php (modified) (history)
  • /trunk/extensions/UploadWizard/UploadWizardHooks.php (modified) (history)
  • /trunk/extensions/UploadWizard/resources/mw.units.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/UploadWizardHooks.php
@@ -336,11 +336,11 @@
337337 'mwe-upwiz-feedback-error1',
338338 'mwe-upwiz-feedback-error2',
339339 'mwe-upwiz-feedback-error3',
340 - 'size-terabytes',
341 - 'size-gigabytes',
342 - 'size-megabytes',
343 - 'size-kilobytes',
344 - 'size-bytes'
 340+ 'mwe-upwiz-size-terabytes',
 341+ 'mwe-upwiz-size-gigabytes',
 342+ 'mwe-upwiz-size-megabytes',
 343+ 'mwe-upwiz-size-kilobytes',
 344+ 'mwe-upwiz-size-bytes'
345345 ),
346346 'group' => 'ext.uploadWizard'
347347 ),
Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php
@@ -268,7 +268,15 @@
269269 'mwe-upwiz-feedback-adding' => 'Adding feedback to page...',
270270 'mwe-upwiz-feedback-error1' => 'Error: Unrecognized result from API',
271271 'mwe-upwiz-feedback-error2' => 'Error: Edit failed',
272 - 'mwe-upwiz-feedback-error3' => 'Error: No response from API'
 272+ 'mwe-upwiz-feedback-error3' => 'Error: No response from API',
 273+
 274+ // similar to mediawiki.special.upload.js
 275+ 'mwe-upwiz-size-terabytes' => '$1 TB',
 276+ 'mwe-upwiz-size-gigabytes' => '$1 GB',
 277+ 'mwe-upwiz-size-megabytes' => '$1 MB',
 278+ 'mwe-upwiz-size-kilobytes' => '$1 K',
 279+ 'mwe-upwiz-size-bytes' => '$1 bytes'
 280+
273281
274282 );
275283
Index: trunk/extensions/UploadWizard/resources/mw.units.js
@@ -1,6 +1,12 @@
22 ( function( mw ) {
33
4 - var scaleMsgKeys = [ 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes', 'size-terabytes' ];
 4+ var scaleMsgKeys = [
 5+ 'mwe-upwiz-size-bytes',
 6+ 'mwe-upwiz-size-kilobytes',
 7+ 'mwe-upwiz-size-megabytes',
 8+ 'mwe-upwiz-size-gigabytes',
 9+ 'mwe-upwiz-size-terabytes'
 10+ ];
511
612 mw.units = {
713

Follow-up revisions

RevisionCommit summaryAuthorDate
r89998revert r89966, also remove terabytes so we can use system core messages, also...neilk19:08, 13 June 2011

Comments

#Comment by Brion VIBBER (talk | contribs)   18:06, 13 June 2011

Shouldn't it just *use* the core messages?

#Comment by NeilK (talk | contribs)   19:17, 13 June 2011

fixed in r89998

Status & tagging log