jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381809 )
Change subject: Add default supplementary licence for PD-Art
......................................................................
Add default supplementary licence for PD-Art
Bug: T175827
Change-Id: Ia2cd99507de60c2e93a76729b4836f4d6c341672
---
M UploadWizard.config.php
M extension.json
M i18n/en.json
M i18n/qqq.json
4 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index cc9c3f6..06148ba 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -395,8 +395,9 @@
'templates' => [ 'PD-old' ]
],
'pd-art' => [
- 'msg' => 'mwe-upwiz-license-pd-art',
- 'templates' => [ 'PD-Art' ]
+ 'msg' => 'mwe-upwiz-license-pd-art-70',
+ 'templates' => [ 'PD-Art|PD-old-70' ],
+ 'url' =>
'//commons.wikimedia.org/wiki/Commons:Licensing#Material_in_the_public_domain',
],
'pd-us' => [
'msg' => 'mwe-upwiz-license-pd-us',
diff --git a/extension.json b/extension.json
index 487704b..bb19323 100644
--- a/extension.json
+++ b/extension.json
@@ -468,7 +468,7 @@
"mwe-upwiz-license-pd-old-100",
"mwe-upwiz-license-pd-old-70-1923",
"mwe-upwiz-license-pd-old",
- "mwe-upwiz-license-pd-art",
+ "mwe-upwiz-license-pd-art-70",
"mwe-upwiz-license-pd-us",
"mwe-upwiz-license-pd-usgov",
"mwe-upwiz-license-pd-usgov-nasa",
diff --git a/i18n/en.json b/i18n/en.json
index 7c21010..4728339 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -263,7 +263,7 @@
"mwe-upwiz-license-own-pd": "All rights waived with Creative Commons
Zero license (like public domain)",
"mwe-upwiz-license-pd-old-100": "Author died more than 100 years ago",
"mwe-upwiz-license-pd-old": "Author died more than 70 years ago",
- "mwe-upwiz-license-pd-art": "Faithful reproduction of a painting that
is in the public domain",
+ "mwe-upwiz-license-pd-art-70": "Faithful reproduction of a painting in
the public domain because the artist died more than 70 years ago ([$2 learn
more])",
"mwe-upwiz-license-pd-us": "First published in the United States before
1923",
"mwe-upwiz-license-pd-usgov": "Original work of the US Federal
Government",
"mwe-upwiz-license-pd-usgov-nasa": "Original work of NASA",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index eb8405a..33fb323 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -290,7 +290,7 @@
"mwe-upwiz-license-own-pd": "Used for the summary text of a license
choice that releases the upload under the Creative Commons Zero license.",
"mwe-upwiz-license-pd-old-100": "Option for a file being in the public
domain because the author died more than 100 years before now.",
"mwe-upwiz-license-pd-old": "Option for a file being in the public
domain because the author died more than 70 years before now.",
- "mwe-upwiz-license-pd-art": "Option for a file being in the public
domain because it is an exact reproduction of a painting that is itself in the
public domain.",
+ "mwe-upwiz-license-pd-art-70": "Option for a file being in the public
domain because it is an exact reproduction of a painting that is itself in the
public domain, as the artist died more than 70 years before
now.\nParameters:\n* $1 - (Unused) empty string\n* $2 - the URL
\"//commons.wikimedia.org/wiki/Commons:Licensing#Material_in_the_public_domain\";
if you replace the $2 value, place it first in comments
<code><!--$2--></code> before the localized URL, to avoid inserting a
FUZZY resource\n\nFor more information, see
https://www.mediawiki.org/wiki/UploadWizard\n{{Related|Mwe-upwiz-license-cc}}",
"mwe-upwiz-license-pd-us": "This is one of the tags for items in the
public domain. It means that the work was published first of all in the US, and
before 1923. The public domain rules are different for works published first of
all outside the US. The template <nowiki>{{PD-1923}}</nowiki> is used on
commons for these. See [[commons:Commons:Hirtle_chart]].",
"mwe-upwiz-license-pd-usgov": "Option for a file being in the public
domain because the author is the US Federal Government.",
"mwe-upwiz-license-pd-usgov-nasa": "Option for a file being in the
public domain because the author is NASA of the US Government.",
--
To view, visit https://gerrit.wikimedia.org/r/381809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2cd99507de60c2e93a76729b4836f4d6c341672
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Cparle <[email protected]>
Gerrit-Reviewer: Cparle <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
