Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405855 )
Change subject: Update text to official Creative Commons text ...................................................................... Update text to official Creative Commons text See https://creativecommons.org/licenses/by/1.0/ https://creativecommons.org/licenses/by/2.0/ https://creativecommons.org/licenses/by/2.5/ https://creativecommons.org/licenses/by/3.0/ https://creativecommons.org/licenses/by/4.0/ Especially the currently missing part "provide a link to the license" is dangerous for reusers. Can result to legal harm. Change-Id: I1f415a4317d790e7032b9f9df0cd9b059288dd55 --- A WikimediaMessages.php M i18n/cclicensetexts/en.json 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages refs/changes/55/405855/1 diff --git a/WikimediaMessages.php b/WikimediaMessages.php new file mode 100644 index 0000000..4c6525f --- /dev/null +++ b/WikimediaMessages.php @@ -0,0 +1,16 @@ +<?php +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'WikimediaMessages' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['WikimediaMessages'] = __DIR__ . '/i18n'; + $wgMessagesDirs['WikimediaMessagesLicenses'] = __DIR__ . '/licensetexts/i18n'; + $wgMessagesDirs['WikimediaMessagesCCLicenses'] = __DIR__ . '/cclicensetexts/i18n'; + /*wfWarn( + 'Deprecated PHP entry point used for TrustedXFF extension. ' . + 'Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + );*/ + return; +} else { + die( 'This version of the TrustedXFF extension requires MediaWiki 1.28+' ); +} diff --git a/i18n/cclicensetexts/en.json b/i18n/cclicensetexts/en.json index 03f4ccd..32b32a6 100644 --- a/i18n/cclicensetexts/en.json +++ b/i18n/cclicensetexts/en.json @@ -208,7 +208,7 @@ "wm-license-cc-free-to-remix-text": "to adapt the work", "wm-license-cc-conditions": "Under the following conditions:", "wm-license-cc-conditions-attribution-header": "attribution", - "wm-license-cc-conditions-attribution-text": "You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).", + "wm-license-cc-conditions-attribution-text": "You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.", "wm-license-cc-conditions-share_alike-header": "share alike", "wm-license-cc-conditions-share_alike-text": "If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.", "wm-license-cc-pd-mark-link": "https://creativecommons.org/publicdomain/mark/1.0/deed.en";, -- To view, visit https://gerrit.wikimedia.org/r/405855 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f415a4317d790e7032b9f9df0cd9b059288dd55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMessages Gerrit-Branch: master Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
