jenkins-bot has submitted this change and it was merged. Change subject: UploadWizard config: Add PD-old-70-1923 license ......................................................................
UploadWizard config: Add PD-old-70-1923 license Adding PD-old-70-1923 to UploadWizard upload form. Per request on https://commons.wikimedia.org/?oldid=128648006#Adding_more_licenses_in_upload_forms The current license choice in UploadWizard is purely U.S.-centric. PD-old-70-1923 honors both, U.S. copyright situation as well as that from most other countries. It is often required for book uploads where authors are not deceased 100 years ago but the work was published before 1923. Change-Id: Iffbe65bfa3f8c34d65d1755b86492d05b24db0d4 --- M wmf-config/CommonSettings.php 1 file changed, 63 insertions(+), 0 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 5f7824c..5767302 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -1768,6 +1768,69 @@ 'flickrApiKey' => 'e9d8174a79c782745289969a45d350e8', // Slowwwwwwww 'campaignExpensiveStatsEnabled' => false, + 'licensing' => array( + 'thirdParty' => array( + 'licenseGroups' => array( + array( + // This should be a list of all CC licenses we can reasonably expect to find around the web + 'head' => 'mwe-upwiz-license-cc-head', + 'subhead' => 'mwe-upwiz-license-cc-subhead', + 'licenses' => array( + 'cc-by-sa-4.0', + 'cc-by-sa-3.0', + 'cc-by-sa-2.5', + 'cc-by-4.0', + 'cc-by-3.0', + 'cc-by-2.5', + 'cc-zero' + ) + ), + array( + // n.b. as of April 2011, Flickr still uses CC 2.0 licenses. + // The White House also has an account there, hence the Public Domain US Government license + 'head' => 'mwe-upwiz-license-flickr-head', + 'subhead' => 'mwe-upwiz-license-flickr-subhead', + 'prependTemplates' => array( 'flickrreview' ), + 'licenses' => array( + 'cc-by-sa-2.0', + 'cc-by-2.0', + 'pd-usgov', + ) + ), + array( + 'head' => 'mwe-upwiz-license-public-domain-usa-head', + 'subhead' => 'mwe-upwiz-license-public-domain-usa-subhead', + 'licenses' => array( + 'pd-us', + 'pd-old-70-1923', + 'pd-art', + ) + ), + array( + 'head' => 'mwe-upwiz-license-usgov-head', + 'licenses' => array( + 'pd-usgov', + 'pd-usgov-nasa' + ) + ), + array( + 'head' => 'mwe-upwiz-license-custom-head', + 'special' => 'custom', + 'licenses' => array( 'custom' ), + ), + array( + 'head' => 'mwe-upwiz-license-none-head', + 'licenses' => array( 'none' ) + ), + ), + ), + ), + 'licenses' => array( + 'pd-old-70-1923' => array( + 'msg' => 'mwe-upwiz-license-pd-old-70-1923', + 'templates' => array( 'PD-old-70-1923' ), + ), + ), ); $wgUploadWizardConfig['enableChunked'] = 'opt-in'; -- To view, visit https://gerrit.wikimedia.org/r/145375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffbe65bfa3f8c34d65d1755b86492d05b24db0d4 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Rillke <ril...@wikipedia.de> Gerrit-Reviewer: Greg Grossmeier <g...@wikimedia.org> Gerrit-Reviewer: Jean-Frédéric <jeanfrederic.w...@gmail.com> Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Rillke <ril...@wikipedia.de> Gerrit-Reviewer: Steinsplitter <steinsplit...@wikipedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
