jenkins-bot has submitted this change and it was merged.
Change subject: mw.ForeignStructuredUpload: Use the right license template for
Commons
......................................................................
mw.ForeignStructuredUpload: Use the right license template for Commons
When uploading locally or to different repo, keep the field empty,
since we don't really know what licenses are appropriate (and we don't
name a specific one in the UI).
Change-Id: I5c8f55653dae42e47ac696d44a7b2082adf6d6f2
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 4ec92e7..dd28ddd 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -149,13 +149,15 @@
};
/**
- * Gets the wikitext for the license of the upload. Abstract for now.
+ * Gets the wikitext for the license of the upload.
*
* @private
* @return {string}
*/
ForeignStructuredUpload.prototype.getLicense = function () {
- return '';
+ // Make sure this matches the messages for different targets in
+ //
mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm
+ return this.target === 'shared' ? '{{self|cc-by-sa-4.0}}' : '';
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/245902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c8f55653dae42e47ac696d44a7b2082adf6d6f2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
