From 8841417a99b08dcc99b4828888b4a1236c33e7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=89OUX?= Date: Wed, 24 Apr 2019 10:16:24 +0200 Subject: [PATCH 1/3] remove unexpected trailing commas in JSON files fixes #5437 and #5439 --- package.nls.de.json | 2 +- package.nls.es.json | 2 +- package.nls.fr.json | 2 +- package.nls.ja.json | 2 +- package.nls.ko-kr.json | 2 +- package.nls.pt-br.json | 2 +- package.nls.zh-cn.json | 2 +- package.nls.zh-tw.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.nls.de.json b/package.nls.de.json index 0cfb8101c7e9..63bf670ea03c 100644 --- a/package.nls.de.json +++ b/package.nls.de.json @@ -28,5 +28,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Pyramid-Anwendung", - "python.snippet.launch.attach.label": "Python: Anfügen", + "python.snippet.launch.attach.label": "Python: Anfügen" } diff --git a/package.nls.es.json b/package.nls.es.json index fa6661ea96e0..3117226a4c34 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -28,5 +28,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Pyramid", - "python.snippet.launch.attach.label": "Python: Adjuntar", + "python.snippet.launch.attach.label": "Python: Adjuntar" } diff --git a/package.nls.fr.json b/package.nls.fr.json index 27a2822bc6f7..14e4cea23758 100644 --- a/package.nls.fr.json +++ b/package.nls.fr.json @@ -27,5 +27,5 @@ "python.snippet.launch.django.label": "Python : Django", "python.snippet.launch.flask.label": "Python : Flask", "python.snippet.launch.pyramid.label": "Python : application Pyramid", - "python.snippet.launch.attach.label": "Python: Attacher", + "python.snippet.launch.attach.label": "Python: Attacher" } diff --git a/package.nls.ja.json b/package.nls.ja.json index 04bb243e702a..9815d74cb093 100644 --- a/package.nls.ja.json +++ b/package.nls.ja.json @@ -23,5 +23,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Pyramid アプリケーション", - "python.snippet.launch.attach.label": "Python: アタッチ", + "python.snippet.launch.attach.label": "Python: アタッチ" } diff --git a/package.nls.ko-kr.json b/package.nls.ko-kr.json index 94f56c38c709..b83de82bc4f5 100644 --- a/package.nls.ko-kr.json +++ b/package.nls.ko-kr.json @@ -23,5 +23,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Pyramid 응용 프로그램", - "python.snippet.launch.attach.label": "Python: 연결", + "python.snippet.launch.attach.label": "Python: 연결" } diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json index e2d98a636003..cba1df0761b4 100644 --- a/package.nls.pt-br.json +++ b/package.nls.pt-br.json @@ -28,5 +28,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Aplicação Pyramid", - "python.snippet.launch.attach.label": "Python: Anexar", + "python.snippet.launch.attach.label": "Python: Anexar" } diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json index 49251865bef3..983827d0ca6f 100644 --- a/package.nls.zh-cn.json +++ b/package.nls.zh-cn.json @@ -28,5 +28,5 @@ "python.snippet.launch.django.label": "Python: Django", "python.snippet.launch.flask.label": "Python: Flask", "python.snippet.launch.pyramid.label": "Python: Pyramid 应用", - "python.snippet.launch.attach.label": "Python: 附加", + "python.snippet.launch.attach.label": "Python: 附加" } diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json index 97f56b0e1249..45e813c5fff2 100644 --- a/package.nls.zh-tw.json +++ b/package.nls.zh-tw.json @@ -28,5 +28,5 @@ "python.snippet.launch.flask.label": "Python：Flask", "python.snippet.launch.pyramid.label": "Python：Pyramid 程式", "python.snippet.launch.attach.label": "Python：附加", - "python.command.python.discoverTests.title": "探索 Unit 測試項目", + "python.command.python.discoverTests.title": "探索 Unit 測試項目" } From 0fd7cad19f57868161c678da090a780eb08563e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20D=C3=89OUX?= Date: Wed, 24 Apr 2019 16:08:15 +0200 Subject: [PATCH 2/3] add news entry (#5437) --- news/2 Fixes/5437-json-comma.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/2 Fixes/5437-json-comma.md diff --git a/news/2 Fixes/5437-json-comma.md b/news/2 Fixes/5437-json-comma.md new file mode 100644 index 000000000000..b72e74338676 --- /dev/null +++ b/news/2 Fixes/5437-json-comma.md @@ -0,0 +1 @@ +remove unexpected trailing commas in JSON files. From b43f40b1e1b724f6edbc04dbeb733e1b2b5747ae Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Wed, 24 Apr 2019 07:54:17 -0700 Subject: [PATCH 3/3] Update and rename 5437-json-comma.md to 5437.md --- news/2 Fixes/5437-json-comma.md | 1 - news/2 Fixes/5437.md | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 news/2 Fixes/5437-json-comma.md create mode 100644 news/2 Fixes/5437.md diff --git a/news/2 Fixes/5437-json-comma.md b/news/2 Fixes/5437-json-comma.md deleted file mode 100644 index b72e74338676..000000000000 --- a/news/2 Fixes/5437-json-comma.md +++ /dev/null @@ -1 +0,0 @@ -remove unexpected trailing commas in JSON files. diff --git a/news/2 Fixes/5437.md b/news/2 Fixes/5437.md new file mode 100644 index 000000000000..0fc268ed69c2 --- /dev/null +++ b/news/2 Fixes/5437.md @@ -0,0 +1,2 @@ +Remove trailing commas from JSON files. +(thanks [Romain](https://github.com/quarthex))