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 Gemeinfreiheit der Lizenz [https://creativecommons.org/publicdomain/zero/1.0/deed.de CC0] zu.", - "jsonconfig-license-notice-CC0-1.0+": "'''Hinweis:''' Wenn du diese Seite bearbeitest, stimmst du der Veröffentlichung deiner Beiträge unter der Lizenz [https://creativecommons.org/publicdomain/zero/1.0/deed.de CC0] zu.", + "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 der Lizenz [https://creativecommons.org/publicdomain/zero/1.0/deed.de CC0] zu.", + "jsonconfig-license-notice-CC0-1.0": "'''Hinweis:''' Wenn du diese Seite bearbeitest, stimmst du der Veröffentlichung deiner Beiträge unter der Lizenz [https://creativecommons.org/publicdomain/zero/1.0/deed.de CC0] zu.", "right-jsonconfig-flush": "JSON-Konfiguration über die API verändern", "action-jsonconfig-flush": "JsonConfig über die API zu verändern", "apihelp-jsonconfig-description": "Ermöglicht direkten Zugriff auf das JsonConfig-Subsystem.", diff --git a/i18n/en.json b/i18n/en.json index 9349ef3..68a441b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -40,11 +40,11 @@ "jsonconfig-type-abbr-boolean": "(B)", "jsonconfig-type-name-boolean": "boolean", "jsonconfig-license": "Data available under $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero", - "jsonconfig-license-url-CC0-1.0+": "https://creativecommons.org/publicdomain/zero/1.0/", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "By saving changes, you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you irrevocably agree to release your contribution to the public domain under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-box-CC0-1.0+": "{| class='mw-jsonconfig-editnotice'\n| style='mw-jsonconfig-editnotice-icon' | [[Image:PD-icon.svg|30px|link=|PD]]\n| $1\n| style='mw-jsonconfig-editnotice-icon' | [[Image:PD-icon.svg|30px|link=|PD]]\n|}", - "jsonconfig-license-notice-CC0-1.0+": "'''Note:''' When you edit this page, you agree to release your contribution under the [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero", + "jsonconfig-license-url-CC0-1.0": "https://creativecommons.org/publicdomain/zero/1.0/", + "jsonconfig-license-copyrightwarning-CC0-1.0": "By saving changes, you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use], and you irrevocably agree to release your contribution to the public domain under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-box-CC0-1.0": "{| class='mw-jsonconfig-editnotice'\n| style='mw-jsonconfig-editnotice-icon' | [[Image:PD-icon.svg|30px|link=|PD]]\n| $1\n| style='mw-jsonconfig-editnotice-icon' | [[Image:PD-icon.svg|30px|link=|PD]]\n|}", + "jsonconfig-license-notice-CC0-1.0": "'''Note:''' When you edit this page, you agree to release your contribution under the [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "Manipulate JsonConfig via API", "action-jsonconfig-flush": "manipulate JsonConfig via API", "apihelp-jsonconfig-description": "Allows direct access to JsonConfig subsystem.", diff --git a/i18n/es.json b/i18n/es.json index 5e396e0..f09379c 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -42,9 +42,9 @@ "jsonconfig-type-name-number": "número", "jsonconfig-type-name-boolean": "lógico", "jsonconfig-license": "Datos disponibles bajo la $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "Al guardar los cambios, aceptas los [https://wikimediafoundation.org/wiki/Terms_of_Use Términos de Uso], y aceptas de forma irrevocable liberar tu contribución al dominio público en virtud de la licencia [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-CC0-1.0+": "'''Nota:''' al editar esta página, te comprometes a liberar tu contribución bajo la licencia [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero", + "jsonconfig-license-copyrightwarning-CC0-1.0": "Al guardar los cambios, aceptas los [https://wikimediafoundation.org/wiki/Terms_of_Use Términos de Uso], y aceptas de forma irrevocable liberar tu contribución al dominio público en virtud de la licencia [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-CC0-1.0": "'''Nota:''' al editar esta página, te comprometes a liberar tu contribución bajo la licencia [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "Manipular JsonConfig a través de la API", "action-jsonconfig-flush": "manipular JsonConfig a través de la API", "apihelp-jsonconfig-description": "Permite el acceso directo al subsistema JsonConfig.", diff --git a/i18n/fr.json b/i18n/fr.json index a4d6344..397534b 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -42,9 +42,9 @@ "jsonconfig-type-name-number": "nombre", "jsonconfig-type-name-boolean": "booléen", "jsonconfig-license": "Données disponibles sous $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0 Universal", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "En enregistrant les modifications, vous acceptez les [https://wikimediafoundation.org/wiki/Terms_of_Use Conditions d’utilisation], et acceptez irrévocablement de mettre votre contribution dans le domaine public sous la licence [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-CC0-1.0+": "<strong>Note:</strong> Lorsque vous modifiez cette page, vous acceptez de soumettre votre contribution sous licence [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0 Universal", + "jsonconfig-license-copyrightwarning-CC0-1.0": "En enregistrant les modifications, vous acceptez les [https://wikimediafoundation.org/wiki/Terms_of_Use Conditions d’utilisation], et acceptez irrévocablement de mettre votre contribution dans le domaine public sous la licence [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-CC0-1.0": "<strong>Note:</strong> Lorsque vous modifiez cette page, vous acceptez de soumettre votre contribution sous licence [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "Manipuler JsonConfig par API", "action-jsonconfig-flush": "utilser JsonConfig au travers de l'API", "apihelp-jsonconfig-description": "Permet l'accès direct au sous-système JsonConfig.", diff --git a/i18n/he.json b/i18n/he.json index 516fcd9..32dc579 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -38,9 +38,9 @@ "jsonconfig-type-name-number": "מחרוזת", "jsonconfig-type-name-boolean": "בוליאני", "jsonconfig-license": "הנתונים זמינים תחת $1.", - "jsonconfig-license-name-CC0-1.0+": "קריאייטיב קומונז אפס גרסה 1.0 עולמית", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "שמירת השינויים מהווה את הסכמתך ל[https://wikimediafoundation.org/wiki/Terms_of_Use תנאי השימוש], ואת הסכמתך הבלתי־חוזרת לשחרר את התרומה שלך לנחלת הכלל לפי תנאי [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-CC0-1.0+": "'''הערה:''' בעריכת הדף הזה, אתם מסכימים לשחרר את תרומתכם בכפוף לתנאי [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "קריאייטיב קומונז אפס גרסה 1.0 עולמית", + "jsonconfig-license-copyrightwarning-CC0-1.0": "שמירת השינויים מהווה את הסכמתך ל[https://wikimediafoundation.org/wiki/Terms_of_Use תנאי השימוש], ואת הסכמתך הבלתי־חוזרת לשחרר את התרומה שלך לנחלת הכלל לפי תנאי [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-CC0-1.0": "'''הערה:''' בעריכת הדף הזה, אתם מסכימים לשחרר את תרומתכם בכפוף לתנאי [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "טיפול ב־JsonConfig באמצעות API", "action-jsonconfig-flush": "שליטה ב־JsonConfig דרך API", "apihelp-jsonconfig-description": "מאפשר גישה ישירה לתת־מערכת JsonConfig.", diff --git a/i18n/it.json b/i18n/it.json index 2a11c80..6a17d62 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -34,7 +34,7 @@ "jsonconfig-type-name-number": "numero", "jsonconfig-type-name-boolean": "booleano", "jsonconfig-license": "Dati disponibili in base alla licenza $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero", "apihelp-jsonconfig-description": "Consente l'accesso diretto al sottosistema JsonConfig.", "apihelp-jsonconfig-param-namespace": "Numero namespace del titolo da elaborare.", "apihelp-jsonconfig-param-title": "Titolo da elaborare senza prefisso namespace." diff --git a/i18n/ko.json b/i18n/ko.json index d021e5c..77d5b9b 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -11,7 +11,7 @@ "jsonconfig-err-bool": "변수 \"$1\" true나 false여야 합니다", "jsonconfig-err-string": "변수 \"$1\" 문자열이어야 합니다", "jsonconfig-optional-field": "(선택 사항)", - "jsonconfig-license-name-CC0-1.0+": "크리에이티브 커먼즈 제로", + "jsonconfig-license-name-CC0-1.0": "크리에이티브 커먼즈 제로", "apihelp-jsonconfig-param-namespace": "처리할 제목의 이름공간 숫자.", "apihelp-jsonconfig-param-title": "네임스페이스의 어미가 없는 타이틀", "apierror-jsonconfig-paramrequired": "이 명령에는 <var>$1</var> 변수가 필요합니다." diff --git a/i18n/lb.json b/i18n/lb.json index c989489..bae1ead 100644 --- a/i18n/lb.json +++ b/i18n/lb.json @@ -15,7 +15,7 @@ "jsonconfig-type-name-localized": "lokaliséiert", "jsonconfig-type-name-number": "Zuel", "jsonconfig-license": "D'Donnéeë sinn disponibel ënner $1.", - "jsonconfig-license-notice-CC0-1.0+": "'''Notiz:''' Wann Dir dës Säit ännert dat sidd Dir domat averstan datt Äre Beitrag ënner [https://creativecommons.org/publicdomain/zero/1.0/ CC0] publizéiert gëtt.", + "jsonconfig-license-notice-CC0-1.0": "'''Notiz:''' Wann Dir dës Säit ännert dat sidd Dir domat averstan datt Äre Beitrag ënner [https://creativecommons.org/publicdomain/zero/1.0/ CC0] publizéiert gëtt.", "right-jsonconfig-flush": "JsonConfig iwwer d'API manipuléieren", "apihelp-jsonconfig-example-1": "Astellung weisen", "apihelp-jsonconfig-example-2": "[[Zero:TEST]] zrécksetzen", diff --git a/i18n/mk.json b/i18n/mk.json index bb425b1..750f594 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -41,10 +41,10 @@ "jsonconfig-type-abbr-boolean": "(Бл)", "jsonconfig-type-name-boolean": "Булови", "jsonconfig-license": "Податоците се достапни под $1.", - "jsonconfig-license-name-CC0-1.0+": "Криејтив комонс Нула", - "jsonconfig-license-url-CC0-1.0+": "https://creativecommons.org/publicdomain/zero/1.0/deed.mk", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "Зачувувајќи ги промените, се согласувате со [https://wikimediafoundation.org/wiki/Terms_of_Use Условите на употреба] и неотповикливо се согласувате дека вашите придонеси ќе ги објавувате во јавна сопственост под лиценцата [https://creativecommons.org/publicdomain/zero/1.0/deed.mk CC0].", - "jsonconfig-license-notice-CC0-1.0+": "'''Напомена:''' Кога ја уредувате страницава, се согласувате дека вашите придонеси ќе ги објавувате под лиценцата [https://creativecommons.org/publicdomain/zero/1.0/deed.mk CC0].", + "jsonconfig-license-name-CC0-1.0": "Криејтив комонс Нула", + "jsonconfig-license-url-CC0-1.0": "https://creativecommons.org/publicdomain/zero/1.0/deed.mk", + "jsonconfig-license-copyrightwarning-CC0-1.0": "Зачувувајќи ги промените, се согласувате со [https://wikimediafoundation.org/wiki/Terms_of_Use Условите на употреба] и неотповикливо се согласувате дека вашите придонеси ќе ги објавувате во јавна сопственост под лиценцата [https://creativecommons.org/publicdomain/zero/1.0/deed.mk CC0].", + "jsonconfig-license-notice-CC0-1.0": "'''Напомена:''' Кога ја уредувате страницава, се согласувате дека вашите придонеси ќе ги објавувате под лиценцата [https://creativecommons.org/publicdomain/zero/1.0/deed.mk CC0].", "right-jsonconfig-flush": "Работа со JsonConfig преку извршник", "action-jsonconfig-flush": "работа со JsonConfig преку приложник", "apihelp-jsonconfig-description": "Оозможува непосреден пристап до потсистемот JsonConfig.", diff --git a/i18n/nb.json b/i18n/nb.json index b1de85d..644288d 100644 --- a/i18n/nb.json +++ b/i18n/nb.json @@ -36,9 +36,9 @@ "jsonconfig-type-name-number": "tall", "jsonconfig-type-name-boolean": "boolsk verdi", "jsonconfig-license": "Data tilgjengelig under $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "Ved å lagre endringer godtar du [https://wikimediafoundation.org/wiki/Terms_of_Use bruksvilkårene], og du samtykker i å ugjenkallelig frigi bidraget ditt som offentlig eiendom under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-CC0-1.0+": "'''Merk:''' Når du redigerer denne siden samtykker du i å frigi bidraget ditt under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero", + "jsonconfig-license-copyrightwarning-CC0-1.0": "Ved å lagre endringer godtar du [https://wikimediafoundation.org/wiki/Terms_of_Use bruksvilkårene], og du samtykker i å ugjenkallelig frigi bidraget ditt som offentlig eiendom under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-CC0-1.0": "'''Merk:''' Når du redigerer denne siden samtykker du i å frigi bidraget ditt under [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "Manipulere JsonConfig via API", "action-jsonconfig-flush": "manipulere JsonConfig via API", "apihelp-jsonconfig-description": "Gjør det mulig å få direkte tilgang til undersystemet JsonConfig.", diff --git a/i18n/pl.json b/i18n/pl.json index d2ef96c..ed682dc 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -16,7 +16,7 @@ "jsonconfig-type-name-number": "liczba", "jsonconfig-type-name-boolean": "wartość logiczna", "jsonconfig-license": "Dane dostępne w ramach licencji $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero", "apihelp-jsonconfig-example-1": "Pokaż konfigurację", "apihelp-jsondata-description": "Odbierz zlokalizowane dane JSON." } diff --git a/i18n/pt.json b/i18n/pt.json index 2da3182..f3d019b 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -12,6 +12,6 @@ "jsonconfig-err-number": "O parâmetro \"$1\" deve ser um número", "jsonconfig-move-aborted-ns": "o novo título da página não está configurado para manter a configuração JSON", "jsonconfig-optional-field": "(opcional)", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0 Universal", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0 Universal", "apihelp-jsonconfig-description": "Permite o acesso direto ao subsistema JsonConfig." } diff --git a/i18n/qqq.json b/i18n/qqq.json index c72bb2d..1f2e39d 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -48,11 +48,11 @@ "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": "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-name-CC0-1.0+": "Name of the CC0-1.0 license", - "jsonconfig-license-url-CC0-1.0+": "URL to the CC0-1.0 license description, localized if available", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "Wiki markup of the message to show instead of {{msg-mw|Wikimedia-copyrightwarning}}", - "jsonconfig-license-notice-box-CC0-1.0+": "This box is shown during CC0 data editing. {{optional}}\n\nParameters:\n* $1 - {{msg-mw|jsonconfig-license-notice-box-CC0-1.0+}}", - "jsonconfig-license-notice-CC0-1.0+": "Text to warn the user about CC0 nature of the data that they are editing. This text is shown inside the box {{msg-mw|jsonconfig-license-notice-box-CC0-1.0+}}", + "jsonconfig-license-name-CC0-1.0": "Name of the CC0-1.0 license", + "jsonconfig-license-url-CC0-1.0": "URL to the CC0-1.0 license description, localized if available", + "jsonconfig-license-copyrightwarning-CC0-1.0": "Wiki markup of the message to show instead of {{msg-mw|Wikimedia-copyrightwarning}}", + "jsonconfig-license-notice-box-CC0-1.0": "This box is shown during CC0 data editing. {{optional}}\n\nParameters:\n* $1 - {{msg-mw|jsonconfig-license-notice-box-CC0-1.0}}", + "jsonconfig-license-notice-CC0-1.0": "Text to warn the user about CC0 nature of the data that they are editing. This text is shown inside the box {{msg-mw|jsonconfig-license-notice-box-CC0-1.0}}", "right-jsonconfig-flush": "{{doc-right|jsonconfig-flush}}", "action-jsonconfig-flush": "{{doc-action|jsonconfig-flush}}", "apihelp-jsonconfig-description": "{{doc-apihelp-description|jsonconfig}}", diff --git a/i18n/roa-tara.json b/i18n/roa-tara.json index 14a202c..b83ca1e 100644 --- a/i18n/roa-tara.json +++ b/i18n/roa-tara.json @@ -9,5 +9,5 @@ "jsonconfig-err-string": "Parametre \"$1\" adda essere 'na stringhe", "jsonconfig-optional-field": "(opzionale)", "jsonconfig-license": "Date disponibbile sotte a $1", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero" + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero" } diff --git a/i18n/uk.json b/i18n/uk.json index b69c36e..2b66087 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -40,9 +40,9 @@ "jsonconfig-type-name-number": "число", "jsonconfig-type-name-boolean": "булеве значення", "jsonconfig-license": "Дані доступні на умовах $1.", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zero v1.0 Universal або пізніша версія", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "Зберігаючи зміни, Ви погоджуєтеся з [https://wikimediafoundation.org/wiki/Terms_of_Use Умовами використання], а також на невідкличну передачу свого внеску до суспільного надбання на умовах [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", - "jsonconfig-license-notice-CC0-1.0+": "'''Примітка:''' Редагуючи цю сторінку Ви погоджуєтесь на передачу свого внеску до суспільного надбання на умовах [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zero v1.0 Universal або пізніша версія", + "jsonconfig-license-copyrightwarning-CC0-1.0": "Зберігаючи зміни, Ви погоджуєтеся з [https://wikimediafoundation.org/wiki/Terms_of_Use Умовами використання], а також на невідкличну передачу свого внеску до суспільного надбання на умовах [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", + "jsonconfig-license-notice-CC0-1.0": "'''Примітка:''' Редагуючи цю сторінку Ви погоджуєтесь на передачу свого внеску до суспільного надбання на умовах [https://creativecommons.org/publicdomain/zero/1.0/ CC0].", "right-jsonconfig-flush": "Маніпулювати JsonConfig через API", "action-jsonconfig-flush": "зміну JsonConfig через API", "apihelp-jsonconfig-description": "Забезпечує прямий доступ до підсистеми JsonConfig.", diff --git a/i18n/vi.json b/i18n/vi.json index 5d8485c..663582e 100644 --- a/i18n/vi.json +++ b/i18n/vi.json @@ -38,7 +38,7 @@ "jsonconfig-type-name-number": "số", "jsonconfig-type-abbr-boolean": "(LL)", "jsonconfig-type-name-boolean": "luận lý", - "jsonconfig-license-name-CC0-1.0+": "Creative Commons Zêrô", + "jsonconfig-license-name-CC0-1.0": "Creative Commons Zêrô", "right-jsonconfig-flush": "Điều khiển JsonConfig qua API", "apihelp-jsonconfig-description": "Cho phép truy cập trực tiếp hệ thống con JsonConfig." } diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index 7083468..556a308 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -39,9 +39,9 @@ "jsonconfig-type-name-number": "数值", "jsonconfig-type-name-boolean": "布尔值", "jsonconfig-license": "数据基于$1可用。", - "jsonconfig-license-name-CC0-1.0+": "知识共享CC0", - "jsonconfig-license-copyrightwarning-CC0-1.0+": "保存更改即表示您同意[https://wikimediafoundation.org/wiki/Terms_of_Use 使用条款],并不可撤销地同意依据[https://creativecommons.org/publicdomain/zero/1.0/deed.zh CC0]将您的贡献发表在公有领域。", - "jsonconfig-license-notice-CC0-1.0+": "'''注意:'''当您编辑此页面时,您同意将您的贡献以[https://creativecommons.org/publicdomain/zero/1.0/deed.zh CC0]协议发布。", + "jsonconfig-license-name-CC0-1.0": "知识共享CC0", + "jsonconfig-license-copyrightwarning-CC0-1.0": "保存更改即表示您同意[https://wikimediafoundation.org/wiki/Terms_of_Use 使用条款],并不可撤销地同意依据[https://creativecommons.org/publicdomain/zero/1.0/deed.zh CC0]将您的贡献发表在公有领域。", + "jsonconfig-license-notice-CC0-1.0": "'''注意:'''当您编辑此页面时,您同意将您的贡献以[https://creativecommons.org/publicdomain/zero/1.0/deed.zh CC0]协议发布。", "right-jsonconfig-flush": "通过API操作JsonConfig", "action-jsonconfig-flush": "通过API操作JsonConfig", "apihelp-jsonconfig-description": "允许直接访问JsonConfig子系统。", diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index 4d698b3..a15a4b1 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -21,5 +21,5 @@ "jsonconfig-move-aborted-model": "此頁面的 JSON 設定模型 \"$1\" 與新標題模型 \"$2\" 不符", "jsonconfig-move-aborted-ns": "新頁面的標題未設定要儲存 JSON 設定", "jsonconfig-optional-field": "(選填)", - "jsonconfig-license-name-CC0-1.0+": "創用 CC CC0" + "jsonconfig-license-name-CC0-1.0": "創用 CC CC0" } diff --git a/includes/JCMapDataContentView.php b/includes/JCMapDataContentView.php index 6538d92..b9ab369 100644 --- a/includes/JCMapDataContentView.php +++ b/includes/JCMapDataContentView.php @@ -95,7 +95,7 @@ "sources": "Copied from [http://example.com Example Map Source]", // Mandatory "license" field. Only CC-0 (public domain dedication) is supported. - "license": "CC0-1.0+", + "license": "CC0-1.0", "zoom": 3, "latitude": 0, diff --git a/includes/JCTabularContentView.php b/includes/JCTabularContentView.php index 8e4789b..8b71342 100644 --- a/includes/JCTabularContentView.php +++ b/includes/JCTabularContentView.php @@ -163,7 +163,7 @@ "sources": "Copied from [http://example.com Example Data Source]", // Mandatory "license" field. Only CC-0 (public domain dedication) is supported. - "license": "CC0-1.0+", + "license": "CC0-1.0", // Mandatory fields schema. Each field must be an object with // "name" being a valid identifier with consisting of letters, digits, and "_" diff --git a/tests/phpunit/tabular-bad/bad-fields.json b/tests/phpunit/tabular-bad/bad-fields.json index 4ff9349..e9e8cb2 100644 --- a/tests/phpunit/tabular-bad/bad-fields.json +++ b/tests/phpunit/tabular-bad/bad-fields.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": {} }, diff --git a/tests/phpunit/tabular-bad/bad-fields2.json b/tests/phpunit/tabular-bad/bad-fields2.json index f7b1525..b8c2227 100644 --- a/tests/phpunit/tabular-bad/bad-fields2.json +++ b/tests/phpunit/tabular-bad/bad-fields2.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ [] diff --git a/tests/phpunit/tabular-bad/bad-header-symbol.json b/tests/phpunit/tabular-bad/bad-header-symbol.json index 5faaf3e..acf5611 100644 --- a/tests/phpunit/tabular-bad/bad-header-symbol.json +++ b/tests/phpunit/tabular-bad/bad-header-symbol.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/bad-schema.json b/tests/phpunit/tabular-bad/bad-schema.json index f7ec625..9521273 100644 --- a/tests/phpunit/tabular-bad/bad-schema.json +++ b/tests/phpunit/tabular-bad/bad-schema.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": "", "data": [] } diff --git a/tests/phpunit/tabular-bad/bad-summary.json b/tests/phpunit/tabular-bad/bad-summary.json index cd88e92..9b3e118 100644 --- a/tests/phpunit/tabular-bad/bad-summary.json +++ b/tests/phpunit/tabular-bad/bad-summary.json @@ -2,7 +2,7 @@ "sources": [ "a" ], - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] }, diff --git a/tests/phpunit/tabular-bad/bad-summary2.json b/tests/phpunit/tabular-bad/bad-summary2.json index 23e7a55..574b006 100644 --- a/tests/phpunit/tabular-bad/bad-summary2.json +++ b/tests/phpunit/tabular-bad/bad-summary2.json @@ -1,6 +1,6 @@ { "sources": {"en":"nope"}, - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] }, diff --git a/tests/phpunit/tabular-bad/dup-field-name.json b/tests/phpunit/tabular-bad/dup-field-name.json index 89289e0..4689558 100644 --- a/tests/phpunit/tabular-bad/dup-field-name.json +++ b/tests/phpunit/tabular-bad/dup-field-name.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/extra-field.json b/tests/phpunit/tabular-bad/extra-field.json index c53e6d3..7ec26f1 100644 --- a/tests/phpunit/tabular-bad/extra-field.json +++ b/tests/phpunit/tabular-bad/extra-field.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/extra-schema.json b/tests/phpunit/tabular-bad/extra-schema.json index 2c63f64..7dbe51c 100644 --- a/tests/phpunit/tabular-bad/extra-schema.json +++ b/tests/phpunit/tabular-bad/extra-schema.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [], "extra": "" diff --git a/tests/phpunit/tabular-bad/extra-top.json b/tests/phpunit/tabular-bad/extra-top.json index 0e611b6..8010adc 100644 --- a/tests/phpunit/tabular-bad/extra-top.json +++ b/tests/phpunit/tabular-bad/extra-top.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] }, diff --git a/tests/phpunit/tabular-bad/no-field-name.json b/tests/phpunit/tabular-bad/no-field-name.json index 9b298b5..b669193 100644 --- a/tests/phpunit/tabular-bad/no-field-name.json +++ b/tests/phpunit/tabular-bad/no-field-name.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [{ "type": "string" diff --git a/tests/phpunit/tabular-bad/no-field-type.json b/tests/phpunit/tabular-bad/no-field-type.json index b2fe789..d96c436 100644 --- a/tests/phpunit/tabular-bad/no-field-type.json +++ b/tests/phpunit/tabular-bad/no-field-type.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [{ "name": "a" diff --git a/tests/phpunit/tabular-bad/no-fields.json b/tests/phpunit/tabular-bad/no-fields.json index 19e5ed4..92f993e 100644 --- a/tests/phpunit/tabular-bad/no-fields.json +++ b/tests/phpunit/tabular-bad/no-fields.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": {}, "data": [] } diff --git a/tests/phpunit/tabular-bad/no-rows.json b/tests/phpunit/tabular-bad/no-rows.json index d612651..da6859a 100644 --- a/tests/phpunit/tabular-bad/no-rows.json +++ b/tests/phpunit/tabular-bad/no-rows.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] } diff --git a/tests/phpunit/tabular-bad/no-schema.json b/tests/phpunit/tabular-bad/no-schema.json index dd07e32..231524e 100644 --- a/tests/phpunit/tabular-bad/no-schema.json +++ b/tests/phpunit/tabular-bad/no-schema.json @@ -1,4 +1,4 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "data": [] } diff --git a/tests/phpunit/tabular-bad/row-count-mismatch.json b/tests/phpunit/tabular-bad/row-count-mismatch.json index 064db8b..e4d278b 100644 --- a/tests/phpunit/tabular-bad/row-count-mismatch.json +++ b/tests/phpunit/tabular-bad/row-count-mismatch.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/row-vals-count.json b/tests/phpunit/tabular-bad/row-vals-count.json index 983325e..e882a1e 100644 --- a/tests/phpunit/tabular-bad/row-vals-count.json +++ b/tests/phpunit/tabular-bad/row-vals-count.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/type-mismatch.json b/tests/phpunit/tabular-bad/type-mismatch.json index f3edad2..8b62c51 100644 --- a/tests/phpunit/tabular-bad/type-mismatch.json +++ b/tests/phpunit/tabular-bad/type-mismatch.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-bad/unknown-type.json b/tests/phpunit/tabular-bad/unknown-type.json index 17e7d1a..93efd8e 100644 --- a/tests/phpunit/tabular-bad/unknown-type.json +++ b/tests/phpunit/tabular-bad/unknown-type.json @@ -1,5 +1,5 @@ { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { diff --git a/tests/phpunit/tabular-good/01.json b/tests/phpunit/tabular-good/01.json index c57cf3c..14a2811 100644 --- a/tests/phpunit/tabular-good/01.json +++ b/tests/phpunit/tabular-good/01.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [ { @@ -13,7 +13,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "schema": { "fields": [ @@ -28,7 +28,7 @@ }, "fr": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "schema": { "fields": [ diff --git a/tests/phpunit/tabular-good/02.json b/tests/phpunit/tabular-good/02.json index cc7850a..b057a33 100644 --- a/tests/phpunit/tabular-good/02.json +++ b/tests/phpunit/tabular-good/02.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "description": { "en": "data info" }, @@ -19,7 +19,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { diff --git a/tests/phpunit/tabular-good/03.json b/tests/phpunit/tabular-good/03.json index 525d457..5187776 100644 --- a/tests/phpunit/tabular-good/03.json +++ b/tests/phpunit/tabular-good/03.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "description": { "en": "data info" }, @@ -16,7 +16,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { diff --git a/tests/phpunit/tabular-good/04.json b/tests/phpunit/tabular-good/04.json index cc7850a..b057a33 100644 --- a/tests/phpunit/tabular-good/04.json +++ b/tests/phpunit/tabular-good/04.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "description": { "en": "data info" }, @@ -19,7 +19,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { diff --git a/tests/phpunit/tabular-good/05.json b/tests/phpunit/tabular-good/05.json index 38a9d54..56b4c04 100644 --- a/tests/phpunit/tabular-good/05.json +++ b/tests/phpunit/tabular-good/05.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "description": { "en": "data info", "fr": "" @@ -24,7 +24,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { @@ -44,7 +44,7 @@ }, "fr": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "", "schema": { diff --git a/tests/phpunit/tabular-good/06.json b/tests/phpunit/tabular-good/06.json index fc2d150..d89da62 100644 --- a/tests/phpunit/tabular-good/06.json +++ b/tests/phpunit/tabular-good/06.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "description": { "en": "data info" }, @@ -62,7 +62,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { @@ -112,7 +112,7 @@ }, "he": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { @@ -163,7 +163,7 @@ }, "fr": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "description": "data info", "schema": { diff --git a/tests/phpunit/tabular-good/07.json b/tests/phpunit/tabular-good/07.json index c942600..e3bfe12 100644 --- a/tests/phpunit/tabular-good/07.json +++ b/tests/phpunit/tabular-good/07.json @@ -1,6 +1,6 @@ { "raw": { - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] }, @@ -8,7 +8,7 @@ }, "en": { "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "schema": { "fields": [] diff --git a/tests/phpunit/tabular-good/08.json b/tests/phpunit/tabular-good/08.json index f955345..53b48ec 100644 --- a/tests/phpunit/tabular-good/08.json +++ b/tests/phpunit/tabular-good/08.json @@ -1,7 +1,7 @@ { "raw": { "sources": "Something [http://example.com with a link]", - "license": "CC0-1.0+", + "license": "CC0-1.0", "schema": { "fields": [] }, @@ -10,7 +10,7 @@ "en": { "sources": "Something [http://example.com with a link]", "license": { - "code": "CC0-1.0+" + "code": "CC0-1.0" }, "schema": { "fields": [] -- To view, visit https://gerrit.wikimedia.org/r/338013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b8edfcc4b02e90da71793aaf0eb9013e661d091 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/JsonConfig Gerrit-Branch: wmf/1.29.0-wmf.12 Gerrit-Owner: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits