r67797 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r67796‎ | r67797 | r67798 >
Date:10:11, 10 June 2010
Author:raymond
Status:ok
Tags:
Comment:
Follow-up r67772: Prefix licenses messages keys with 'mwe-upwiz-' too to avoid conflicts with other extensions and/or core or local customizations.
Modified paths:
  • /trunk/extensions/UploadWizard/UploadWizard.i18n.php (modified) (history)
  • /trunk/extensions/UploadWizard/UploadWizardPage.js (modified) (history)

Diff [purge]

Index: trunk/extensions/UploadWizard/UploadWizard.i18n.php
@@ -137,12 +137,12 @@
138138
139139 /* LICENSES */
140140 /* surprisingly we don't seem to have strings for these yet */
141 - 'license-cc-by-sa-3.0' => 'Creative Commons Attribution ShareAlike 3.0',
142 - 'license-cc-by-3.0' => 'Creative Commons Attribution 3.0',
143 - 'license-cc-zero' => 'Creative Commons CC0 Waiver',
144 - 'license-gfdl' => 'GNU Free Documentation License',
 141+ 'mwe-upwiz-license-cc-by-sa-3.0' => 'Creative Commons Attribution ShareAlike 3.0',
 142+ 'mwe-upwiz-license-cc-by-3.0' => 'Creative Commons Attribution 3.0',
 143+ 'mwe-upwiz-license-cc-zero' => 'Creative Commons CC0 Waiver',
 144+ 'mwe-upwiz-license-gfdl' => 'GNU Free Documentation License',
145145 /* this is just for testing, we are not going to privilege the US and A */
146 - 'license-pd-us' => 'Public Domain (US)'
 146+ 'mwe-upwiz-license-pd-us' => 'Public Domain (US)'
147147 );
148148
149149 /** Message documentation (Message documentation)
Index: trunk/extensions/UploadWizard/UploadWizardPage.js
@@ -49,12 +49,12 @@
5050 // names of all license templates, in order. Case sensitive!
5151 // n.b. in the future, the licenses for a wiki will probably be defined in PHP or even LocalSettings.
5252 licenses: [
53 - { template: 'Cc-by-sa-3.0', messageKey: 'license-cc-by-sa-3.0', 'default': true },
54 - { template: 'Cc-by-3.0', messageKey: 'license-cc-by-3.0', 'default': false },
55 - { template: 'Cc-zero', messageKey: 'license-cc-zero', 'default': false },
 53+ { template: 'Cc-by-sa-3.0', messageKey: 'mwe-upwiz-license-cc-by-sa-3.0', 'default': true },
 54+ { template: 'Cc-by-3.0', messageKey: 'mwe-upwiz-license-cc-by-3.0', 'default': false },
 55+ { template: 'Cc-zero', messageKey: 'mwe-upwiz-license-cc-zero', 'default': false },
5656 // n.b. the PD-US is only for testing purposes, obviously we need some geographical discrimination here...
57 - { template: 'PD-US', messageKey: 'license-pd-us', 'default': false },
58 - { template: 'GFDL', messageKey: 'license-gfdl', 'default': false }
 57+ { template: 'PD-US', messageKey: 'mwe-upwiz-license-pd-us', 'default': false },
 58+ { template: 'GFDL', messageKey: 'mwe-upwiz-license-gfdl', 'default': false }
5959 ],
6060
6161 // usually, but not always, File:

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r67772update licenses to work with the proper templates, not using hardcoded string...neilk03:25, 10 June 2010

Status & tagging log