Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325621
Change subject: Per legal, add "license prompt"
......................................................................
Per legal, add "license prompt"
Add extra license prefix text in front of the
license name
Change-Id: If5c149aeac55c820772e89512e9f3ee37d8292be
---
M i18n/en.json
M i18n/qqq.json
M includes/JCDataContent.php
3 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig
refs/changes/21/325621/1
diff --git a/i18n/en.json b/i18n/en.json
index 7f73a52..5c354ae 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -39,6 +39,7 @@
"jsonconfig-type-name-number": "number",
"jsonconfig-type-abbr-boolean": "(B)",
"jsonconfig-type-name-boolean": "boolean",
+ "jsonconfig-license": "This data is licensed as $1",
"jsonconfig-license-or-later": "$1, or (at your option) any later
version",
"jsonconfig-license-CC0-1.0": "Creative Commons Zero v1.0 Universal",
"jsonconfig-license-url-CC0-1.0":
"https://creativecommons.org/publicdomain/zero/1.0/";,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a40a222..c6aea8e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -47,7 +47,8 @@
"jsonconfig-type-name-number": "Description of the type of data
contained in this column. Shown for columns that contain
numbers\n{{Identical|Number}}",
"jsonconfig-type-abbr-boolean": "A very short indicator of the type of
data contained in this column. Shown for columns that contain booleans (true or
false)",
"jsonconfig-type-name-boolean": "Description of the type of data
contained in this column. Shown for columns that contain booleans (true or
false)\n{{Identical|Boolean}}",
- "jsonconfig-license-or-later": "In case the data can be used with any
future versions of a license, this string will be used instead of
'jsonconfig-license-*' message.\n\nParameters:\n* $1 - license name, as defined
in the 'jsonconfig-license-*' messages",
+ "jsonconfig-license": "Shows license text prefix before giving the
specific license.\n\nParameters:\n* $1 - *
{{msg-mw|jsonconfig-license-or-later}} or {{msg-mw|jsonconfig-license-CC0-1.0}}
or other similar license messages",
+ "jsonconfig-license-or-later": "In case the data can be used with any
future versions of a license, this string will be used instead of
'jsonconfig-license-*' message.\n\nParameters:\n* $1 - license name, as defined
in the {{msg-mw|jsonconfig-license-CC0-1.0}} and similar messages",
"jsonconfig-license-CC0-1.0": "Name of the license",
"jsonconfig-license-url-CC0-1.0": "URL to the license description,
localized if available",
"right-jsonconfig-flush": "{{doc-right|jsonconfig-flush}}",
diff --git a/includes/JCDataContent.php b/includes/JCDataContent.php
index 0188d4f..dca3a3b 100644
--- a/includes/JCDataContent.php
+++ b/includes/JCDataContent.php
@@ -116,6 +116,8 @@
$text = wfMessage(
'jsonconfig-license-or-later', $text )->plain();
}
+ $text = wfMessage( 'jsonconfig-license', $text
)->plain();
+
$html = Html::rawElement( 'p', [ 'class' =>
'mw-jsonconfig-license' ], $text );
} else {
$html = '';
--
To view, visit https://gerrit.wikimedia.org/r/325621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5c149aeac55c820772e89512e9f3ee37d8292be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
