[MediaWiki-commits] [Gerrit] Text changes for better handling of PD and nonfree licenses - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged. Change subject: Text changes for better handling of PD and nonfree licenses .. Text changes for better handling of PD and nonfree licenses Bug: T70687 Change-Id: I84e0094559e5b438fcb33b8511dc0184435c1a37 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/1004 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/631 --- M MultimediaViewer.php M i18n/en.json M i18n/qqq.json M resources/mmv/mmv.EmbedFileFormatter.js M resources/mmv/model/mmv.model.Image.js M resources/mmv/model/mmv.model.License.js M resources/mmv/provider/mmv.provider.ImageInfo.js M resources/mmv/ui/mmv.ui.download.pane.js M tests/qunit/mmv/mmv.EmbedFileFormatter.test.js M tests/qunit/mmv/model/mmv.model.Image.test.js M tests/qunit/mmv/model/mmv.model.License.test.js M tests/qunit/mmv/provider/mmv.provider.ImageInfo.test.js M tests/qunit/mmv/ui/mmv.ui.reuse.utils.test.js 13 files changed, 184 insertions(+), 39 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 7a47510..2ca3ad0 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -453,6 +453,7 @@ 'multimediaviewer-embed-dimensions', 'multimediaviewer-embed-dimensions-with-file-format', 'multimediaviewer-download-attribution-cta-header', + 'multimediaviewer-download-optional-attribution-cta-header', 'multimediaviewer-download-attribution-cta', 'multimediaviewer-attr-plain', 'multimediaviewer-attr-html', @@ -637,20 +638,28 @@ 'multimediaviewer-credit', 'multimediaviewer-text-embed-credit-text-tbls', + 'multimediaviewer-text-embed-credit-text-tbls-nonfree', 'multimediaviewer-text-embed-credit-text-tls', + 'multimediaviewer-text-embed-credit-text-tls-nonfree', 'multimediaviewer-text-embed-credit-text-tbs', 'multimediaviewer-text-embed-credit-text-tbl', + 'multimediaviewer-text-embed-credit-text-tbl-nonfree', 'multimediaviewer-text-embed-credit-text-tb', 'multimediaviewer-text-embed-credit-text-ts', 'multimediaviewer-text-embed-credit-text-tl', + 'multimediaviewer-text-embed-credit-text-tl-nonfree', 'multimediaviewer-html-embed-credit-text-tbls', + 'multimediaviewer-html-embed-credit-text-tbls-nonfree', 'multimediaviewer-html-embed-credit-text-tls', + 'multimediaviewer-html-embed-credit-text-tls-nonfree', 'multimediaviewer-html-embed-credit-text-tbs', 'multimediaviewer-html-embed-credit-text-tbl', + 'multimediaviewer-html-embed-credit-text-tbl-nonfree', 'multimediaviewer-html-embed-credit-text-tb', 'multimediaviewer-html-embed-credit-text-ts', 'multimediaviewer-html-embed-credit-text-tl', + 'multimediaviewer-html-embed-credit-text-tl-nonfree', ), ), diff --git a/i18n/en.json b/i18n/en.json index 8154f9f..4df2ba8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -70,23 +70,32 @@ multimediaviewer-embed-html: HTML, multimediaviewer-embed-explanation: Use this code to embed the file, multimediaviewer-text-embed-credit-text-tbls: \$1\ by $2. Licensed under $3 via $4, + multimediaviewer-text-embed-credit-text-tbls-nonfree: \$1\ by $2. $3 via $4, multimediaviewer-text-embed-credit-text-tls: \$1\. Licensed under $2 via $3, + multimediaviewer-text-embed-credit-text-tls-nonfree: \$1\. $2 via $3, multimediaviewer-text-embed-credit-text-tbs: \$1\ by $2. Via $3, multimediaviewer-text-embed-credit-text-tbl: \$1\ by $2. Licensed under $3, + multimediaviewer-text-embed-credit-text-tbl-nonfree: \$1\ by $2. $3, multimediaviewer-text-embed-credit-text-tb: \$1\ by $2, multimediaviewer-text-embed-credit-text-ts: \$1\. Via $2, multimediaviewer-text-embed-credit-text-tl: \$1\. Licensed under $2, + multimediaviewer-text-embed-credit-text-tl-nonfree: \$1\. $2, multimediaviewer-text-embed-credit-text-t: \$1\, multimediaviewer-html-embed-credit-text-tbls: \$1\ by $2. Licensed under $3 via $4., + multimediaviewer-html-embed-credit-text-tbls-nonfree: \$1\ by $2. $3 via $4., multimediaviewer-html-embed-credit-text-tls: \$1\. Licensed under $2 via $3., +
[MediaWiki-commits] [Gerrit] Text changes for better handling of PD and nonfree licenses - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/175573 Change subject: Text changes for better handling of PD and nonfree licenses .. Text changes for better handling of PD and nonfree licenses Bug: T70687 Change-Id: I84e0094559e5b438fcb33b8511dc0184435c1a37 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/1004 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/631 --- M MultimediaViewer.php M i18n/en.json M i18n/qqq.json M resources/mmv/mmv.EmbedFileFormatter.js M resources/mmv/model/mmv.model.Image.js M resources/mmv/model/mmv.model.License.js M resources/mmv/provider/mmv.provider.ImageInfo.js M resources/mmv/ui/mmv.ui.download.pane.js M tests/qunit/mmv/mmv.EmbedFileFormatter.test.js M tests/qunit/mmv/model/mmv.model.Image.test.js M tests/qunit/mmv/model/mmv.model.License.test.js M tests/qunit/mmv/provider/mmv.provider.ImageInfo.test.js M tests/qunit/mmv/ui/mmv.ui.reuse.utils.test.js 13 files changed, 165 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/73/175573/1 diff --git a/MultimediaViewer.php b/MultimediaViewer.php index 7a47510..2ca3ad0 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -453,6 +453,7 @@ 'multimediaviewer-embed-dimensions', 'multimediaviewer-embed-dimensions-with-file-format', 'multimediaviewer-download-attribution-cta-header', + 'multimediaviewer-download-optional-attribution-cta-header', 'multimediaviewer-download-attribution-cta', 'multimediaviewer-attr-plain', 'multimediaviewer-attr-html', @@ -637,20 +638,28 @@ 'multimediaviewer-credit', 'multimediaviewer-text-embed-credit-text-tbls', + 'multimediaviewer-text-embed-credit-text-tbls-nonfree', 'multimediaviewer-text-embed-credit-text-tls', + 'multimediaviewer-text-embed-credit-text-tls-nonfree', 'multimediaviewer-text-embed-credit-text-tbs', 'multimediaviewer-text-embed-credit-text-tbl', + 'multimediaviewer-text-embed-credit-text-tbl-nonfree', 'multimediaviewer-text-embed-credit-text-tb', 'multimediaviewer-text-embed-credit-text-ts', 'multimediaviewer-text-embed-credit-text-tl', + 'multimediaviewer-text-embed-credit-text-tl-nonfree', 'multimediaviewer-html-embed-credit-text-tbls', + 'multimediaviewer-html-embed-credit-text-tbls-nonfree', 'multimediaviewer-html-embed-credit-text-tls', + 'multimediaviewer-html-embed-credit-text-tls-nonfree', 'multimediaviewer-html-embed-credit-text-tbs', 'multimediaviewer-html-embed-credit-text-tbl', + 'multimediaviewer-html-embed-credit-text-tbl-nonfree', 'multimediaviewer-html-embed-credit-text-tb', 'multimediaviewer-html-embed-credit-text-ts', 'multimediaviewer-html-embed-credit-text-tl', + 'multimediaviewer-html-embed-credit-text-tl-nonfree', ), ), diff --git a/i18n/en.json b/i18n/en.json index 8154f9f..4df2ba8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -70,23 +70,32 @@ multimediaviewer-embed-html: HTML, multimediaviewer-embed-explanation: Use this code to embed the file, multimediaviewer-text-embed-credit-text-tbls: \$1\ by $2. Licensed under $3 via $4, + multimediaviewer-text-embed-credit-text-tbls-nonfree: \$1\ by $2. $3 via $4, multimediaviewer-text-embed-credit-text-tls: \$1\. Licensed under $2 via $3, + multimediaviewer-text-embed-credit-text-tls-nonfree: \$1\. $2 via $3, multimediaviewer-text-embed-credit-text-tbs: \$1\ by $2. Via $3, multimediaviewer-text-embed-credit-text-tbl: \$1\ by $2. Licensed under $3, + multimediaviewer-text-embed-credit-text-tbl-nonfree: \$1\ by $2. $3, multimediaviewer-text-embed-credit-text-tb: \$1\ by $2, multimediaviewer-text-embed-credit-text-ts: \$1\. Via $2, multimediaviewer-text-embed-credit-text-tl: \$1\. Licensed under $2, + multimediaviewer-text-embed-credit-text-tl-nonfree: \$1\. $2, multimediaviewer-text-embed-credit-text-t: \$1\, multimediaviewer-html-embed-credit-text-tbls: \$1\ by $2. Licensed under $3 via $4., + multimediaviewer-html-embed-credit-text-tbls-nonfree: \$1\ by $2. $3 via $4., multimediaviewer-html-embed-credit-text-tls: \$1\.
