[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[wmf/1.29.0-wmf.12]: Remove the '+' in 'CC0-1.0+'
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338013 )
Change subject: Remove the '+' in 'CC0-1.0+'
..
Remove the '+' in 'CC0-1.0+'
It implies future versions of the CC0 license, which doesn't make sense.
Bug: T154075
Change-Id: I2b8edfcc4b02e90da71793aaf0eb9013e661d091
(cherry picked from commit a05c5aab4d4c916fd49bb5d27e41c688d411e1e2)
---
M extension.json
M i18n/ast.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fr.json
M i18n/he.json
M i18n/it.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/pl.json
M i18n/pt.json
M i18n/qqq.json
M i18n/roa-tara.json
M i18n/uk.json
M i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M includes/JCMapDataContentView.php
M includes/JCTabularContentView.php
M tests/phpunit/tabular-bad/bad-fields.json
M tests/phpunit/tabular-bad/bad-fields2.json
M tests/phpunit/tabular-bad/bad-header-symbol.json
M tests/phpunit/tabular-bad/bad-schema.json
M tests/phpunit/tabular-bad/bad-summary.json
M tests/phpunit/tabular-bad/bad-summary2.json
M tests/phpunit/tabular-bad/dup-field-name.json
M tests/phpunit/tabular-bad/extra-field.json
M tests/phpunit/tabular-bad/extra-schema.json
M tests/phpunit/tabular-bad/extra-top.json
M tests/phpunit/tabular-bad/no-field-name.json
M tests/phpunit/tabular-bad/no-field-type.json
M tests/phpunit/tabular-bad/no-fields.json
M tests/phpunit/tabular-bad/no-rows.json
M tests/phpunit/tabular-bad/no-schema.json
M tests/phpunit/tabular-bad/row-count-mismatch.json
M tests/phpunit/tabular-bad/row-vals-count.json
M tests/phpunit/tabular-bad/type-mismatch.json
M tests/phpunit/tabular-bad/unknown-type.json
M tests/phpunit/tabular-good/01.json
M tests/phpunit/tabular-good/02.json
M tests/phpunit/tabular-good/03.json
M tests/phpunit/tabular-good/04.json
M tests/phpunit/tabular-good/05.json
M tests/phpunit/tabular-good/06.json
M tests/phpunit/tabular-good/07.json
M tests/phpunit/tabular-good/08.json
49 files changed, 88 insertions(+), 88 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index b7cc0c0..3d39a68 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
"value": false
},
"JsonConfigAllowedLicenses": {
- "value": [ "CC0-1.0+" ]
+ "value": [ "CC0-1.0" ]
},
"JsonConfigInterwikiPrefix": {
"value": "commons"
diff --git a/i18n/ast.json b/i18n/ast.json
index 7fc04e4..3b33ca7 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "númberu",
"jsonconfig-type-name-boolean": "lóxicu",
"jsonconfig-license": "Datos disponibles so la $1.",
- "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0
Universal o versión posterior",
- "jsonconfig-license-copyrightwarning-CC0-1.0+": "Al guardar los
cambeos, aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use
Condiciones d'Usu], y aceutes de forma irrefugable lliberar la to contribución
al dominiu públicu baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
- "jsonconfig-license-notice-CC0-1.0+": "'''Nota:''' al editar esta
páxina, aceutes lliberar la to contribución baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
+ "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0
Universal o versión posterior",
+ "jsonconfig-license-copyrightwarning-CC0-1.0": "Al guardar los cambeos,
aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use Condiciones
d'Usu], y aceutes de forma irrefugable lliberar la to contribución al dominiu
públicu baxo llicencia [https://creativecommons.org/publicdomain/zero/1.0/
CC0].",
+ "jsonconfig-license-notice-CC0-1.0": "'''Nota:''' al editar esta
páxina, aceutes lliberar la to contribución baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
"right-jsonconfig-flush": "Tresformar JsonConfig pela API",
"action-jsonconfig-flush": "remanar JsonConfig pela API",
"apihelp-jsonconfig-description": "Permite l'accesu direutu al
subsistema JsonConfig.",
diff --git a/i18n/de.json b/i18n/de.json
index c4f5525..abe6bf3 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "Zahl",
"jsonconfig-type-name-boolean": "boolesch",
"jsonconfig-license": "Die Daten sind verfügbar unter der Lizenz $1.",
- "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero",
- "jsonconfig-license-copyrightwarning-CC0-1.0+": "Mit dem Speichern von
Änderungen stimmst du den [https://wikimediafoundation.org/wiki/Terms_of_Use/de
Nutzungsbedingungen] und der unwiderruflichen Veröffentlichung deiner Beiträge
unter der Gemeinfreiheit
[MediaWiki-commits] [Gerrit] mediawiki...JsonConfig[wmf/1.29.0-wmf.12]: Remove the '+' in 'CC0-1.0+'
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338013 )
Change subject: Remove the '+' in 'CC0-1.0+'
..
Remove the '+' in 'CC0-1.0+'
It implies future versions of the CC0 license, which doesn't make sense.
Bug: T154075
Change-Id: I2b8edfcc4b02e90da71793aaf0eb9013e661d091
(cherry picked from commit a05c5aab4d4c916fd49bb5d27e41c688d411e1e2)
---
M extension.json
M i18n/ast.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
M i18n/fr.json
M i18n/he.json
M i18n/it.json
M i18n/ko.json
M i18n/lb.json
M i18n/mk.json
M i18n/nb.json
M i18n/pl.json
M i18n/pt.json
M i18n/qqq.json
M i18n/roa-tara.json
M i18n/uk.json
M i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M includes/JCMapDataContentView.php
M includes/JCTabularContentView.php
M tests/phpunit/tabular-bad/bad-fields.json
M tests/phpunit/tabular-bad/bad-fields2.json
M tests/phpunit/tabular-bad/bad-header-symbol.json
M tests/phpunit/tabular-bad/bad-schema.json
M tests/phpunit/tabular-bad/bad-summary.json
M tests/phpunit/tabular-bad/bad-summary2.json
M tests/phpunit/tabular-bad/dup-field-name.json
M tests/phpunit/tabular-bad/extra-field.json
M tests/phpunit/tabular-bad/extra-schema.json
M tests/phpunit/tabular-bad/extra-top.json
M tests/phpunit/tabular-bad/no-field-name.json
M tests/phpunit/tabular-bad/no-field-type.json
M tests/phpunit/tabular-bad/no-fields.json
M tests/phpunit/tabular-bad/no-rows.json
M tests/phpunit/tabular-bad/no-schema.json
M tests/phpunit/tabular-bad/row-count-mismatch.json
M tests/phpunit/tabular-bad/row-vals-count.json
M tests/phpunit/tabular-bad/type-mismatch.json
M tests/phpunit/tabular-bad/unknown-type.json
M tests/phpunit/tabular-good/01.json
M tests/phpunit/tabular-good/02.json
M tests/phpunit/tabular-good/03.json
M tests/phpunit/tabular-good/04.json
M tests/phpunit/tabular-good/05.json
M tests/phpunit/tabular-good/06.json
M tests/phpunit/tabular-good/07.json
M tests/phpunit/tabular-good/08.json
49 files changed, 88 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/JsonConfig
refs/changes/13/338013/1
diff --git a/extension.json b/extension.json
index b7cc0c0..3d39a68 100644
--- a/extension.json
+++ b/extension.json
@@ -161,7 +161,7 @@
"value": false
},
"JsonConfigAllowedLicenses": {
- "value": [ "CC0-1.0+" ]
+ "value": [ "CC0-1.0" ]
},
"JsonConfigInterwikiPrefix": {
"value": "commons"
diff --git a/i18n/ast.json b/i18n/ast.json
index 7fc04e4..3b33ca7 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "númberu",
"jsonconfig-type-name-boolean": "lóxicu",
"jsonconfig-license": "Datos disponibles so la $1.",
- "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0
Universal o versión posterior",
- "jsonconfig-license-copyrightwarning-CC0-1.0+": "Al guardar los
cambeos, aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use
Condiciones d'Usu], y aceutes de forma irrefugable lliberar la to contribución
al dominiu públicu baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
- "jsonconfig-license-notice-CC0-1.0+": "'''Nota:''' al editar esta
páxina, aceutes lliberar la to contribución baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
+ "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0
Universal o versión posterior",
+ "jsonconfig-license-copyrightwarning-CC0-1.0": "Al guardar los cambeos,
aceutes les [https://wikimediafoundation.org/wiki/Terms_of_Use Condiciones
d'Usu], y aceutes de forma irrefugable lliberar la to contribución al dominiu
públicu baxo llicencia [https://creativecommons.org/publicdomain/zero/1.0/
CC0].",
+ "jsonconfig-license-notice-CC0-1.0": "'''Nota:''' al editar esta
páxina, aceutes lliberar la to contribución baxo llicencia
[https://creativecommons.org/publicdomain/zero/1.0/ CC0].",
"right-jsonconfig-flush": "Tresformar JsonConfig pela API",
"action-jsonconfig-flush": "remanar JsonConfig pela API",
"apihelp-jsonconfig-description": "Permite l'accesu direutu al
subsistema JsonConfig.",
diff --git a/i18n/de.json b/i18n/de.json
index c4f5525..abe6bf3 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -36,9 +36,9 @@
"jsonconfig-type-name-number": "Zahl",
"jsonconfig-type-name-boolean": "boolesch",
"jsonconfig-license": "Die Daten sind verfügbar unter der Lizenz $1.",
- "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero",
- "jsonconfig-license-copyrightwarning-CC0-1.0+": "Mit dem Speichern von
Änderungen stimmst du den [https://wikimediafoundation.org/wiki/Terms_of_Use/de
Nutzungsbedingungen] und der unwiderruflichen Veröffentlichung deiner Beiträge
unter der
