r106925 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106924‎ | r106925 | r106926 >
Date:02:49, 21 December 2011
Author:neilk
Status:resolved (Comments)
Tags:
Comment:
move no-license option to bottom, change wording
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.config.php (modified) (history)
  • /trunk/extensions/UploadWizard/UploadWizard.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/UploadWizard.config.php
@@ -265,10 +265,6 @@
266266 'type' => 'or',
267267 'licenseGroups' => array(
268268 array(
269 - 'head' => 'mwe-upwiz-license-none-head',
270 - 'licenses' => array( 'none' )
271 - ),
272 - array(
273269 // This should be a list of all CC licenses we can reasonably expect to find around the web
274270 'head' => 'mwe-upwiz-license-cc-head',
275271 'subhead' => 'mwe-upwiz-license-cc-subhead',
@@ -313,6 +309,10 @@
314310 'special' => 'custom',
315311 'licenses' => array( 'custom' ),
316312 ),
 313+ array(
 314+ 'head' => 'mwe-upwiz-license-none-head',
 315+ 'licenses' => array( 'none' )
 316+ ),
317317 ),
318318 'defaults' => array( 'none' ),
319319 ),
Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php
@@ -277,8 +277,9 @@
278278 'mwe-upwiz-license-custom-preview' => 'Preview',
279279
280280 'mwe-upwiz-license-none-head' => 'I found it on the Internet -- I\'m not sure',
281 - 'mwe-upwiz-license-none' => 'Upload {{PLURAL:$1|this file|these files}} without copyright information for now. I understand {{PLURAL:$1|this file|these files}} may be deleted.',
282281
 282+ 'mwe-upwiz-license-none' => 'I believe {{PLURAL:$1|this work is|these works are}} freely licensed or legally in the public domain. I understand that if I do not add the necessary licensing information in a timely fashion the {{PLURAL:$1|file|files}} may be deleted.',
 283+
283284 'mwe-upwiz-license-confirm-remove' => 'Are you sure you want to remove {{PLURAL:$1|this upload|these uploads}}?',
284285 'mwe-upwiz-license-confirm-remove-title' => 'Confirm remove',
285286

Comments

#Comment by Santhosh.thottingal (talk | contribs)   04:45, 21 December 2011

Do we need to put a comma in 'mwe-upwiz-license-none' after the word 'fashion' , like this: .... if I do not add the necessary licensing information in a timely fashion, the files may be deleted

#Comment by Raindrift (talk | contribs)   21:12, 27 December 2011

Yeah, probably. Fixed in r107423

Status & tagging log