From 5cf3dde0a1c865e6c5b18b6607c7a0b3a505c222 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 2 Jul 2020 17:39:31 +0200 Subject: [PATCH] Populang hotfix - Fixed invalid json in populated lang templates --- src/generated/resources/.cache/cache | 18 +++++++++--------- .../assets/create/lang/unfinished/de_de.json | 2 +- .../assets/create/lang/unfinished/fr_fr.json | 2 +- .../assets/create/lang/unfinished/it_it.json | 2 +- .../assets/create/lang/unfinished/ja_jp.json | 2 +- .../assets/create/lang/unfinished/ko_kr.json | 2 +- .../assets/create/lang/unfinished/nl_nl.json | 4 ++-- .../assets/create/lang/unfinished/pt_br.json | 2 +- .../assets/create/lang/unfinished/ru_ru.json | 2 +- .../assets/create/lang/unfinished/zh_cn.json | 2 +- .../create/foundation/data/LangMerger.java | 2 +- .../resources/assets/create/lang/nl_nl.json | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 4828d3b04..7a94afd4f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -337,15 +337,15 @@ c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets\create\blockstates\weathered_lim b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json d6d4eaadc6f2c86dd69b8a818ca7352b85be52cd assets\create\lang\en_ud.json b149cd24e07fcadf25331bac859c313373617462 assets\create\lang\en_us.json -722910566426c6327d032fdf6f5a50abe4294002 assets\create\lang\unfinished\de_de.json -c29c0b2a0150e4d98ba293adb3fbe44bf9f6c8bb assets\create\lang\unfinished\fr_fr.json -4592d8a33170d4fa0f6a50ac179a0adf919ab5db assets\create\lang\unfinished\it_it.json -0b8d23672484d8a1d6d6660f304a8518e2441908 assets\create\lang\unfinished\ja_jp.json -65540c4cba02168f4fbef728cf03b7a5369995e7 assets\create\lang\unfinished\ko_kr.json -e7475d39ed0dba6fc16eec27f9eb7ca2feae8072 assets\create\lang\unfinished\nl_nl.json -023949e413e3be443e9155bc6ec8cf9259e20121 assets\create\lang\unfinished\pt_br.json -28b491b4c99de673f198b99949993df14d4002d5 assets\create\lang\unfinished\ru_ru.json -b9588b8e9b479b44683e32c61d5727c42514f80b assets\create\lang\unfinished\zh_cn.json +feb13f2c71a8ccc5c9a1b3cd58f0e06db6e89825 assets\create\lang\unfinished\de_de.json +e06e04eb9c06679cef7b3b1273c02e83297bf3cb assets\create\lang\unfinished\fr_fr.json +78973e80977ebc94dfadbfc6cd21de91c673f32a assets\create\lang\unfinished\it_it.json +dd821fcf079b96bd636350f9b3c77da13fa8dfc5 assets\create\lang\unfinished\ja_jp.json +92058021567b46150322be87120ca009cf74f808 assets\create\lang\unfinished\ko_kr.json +c076938f726f8ed92ebc8bb27b9df415fb8f06be assets\create\lang\unfinished\nl_nl.json +e4562ef48bd555d84dbe13233e850e0bd0917a90 assets\create\lang\unfinished\pt_br.json +dfacb15608f4b043e06a6ac9441234acbfccf708 assets\create\lang\unfinished\ru_ru.json +a685880eb8e0dd580f74675e66e8470b01415c50 assets\create\lang\unfinished\zh_cn.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 4653db832..d920041b5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 774" + "_": "Missing Localizations: 774", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 92d6c5815..b4b09cdfc 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 376" + "_": "Missing Localizations: 376", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 94d80b3f9..e477c8700 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 360" + "_": "Missing Localizations: 360", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index e71dae427..eb1aba63d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 355" + "_": "Missing Localizations: 355", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 78483095a..a46b6bf9b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 360" + "_": "Missing Localizations: 360", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 104323103..72168412c 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 710" + "_": "Missing Localizations: 710", "_": "->------------------------] Game Elements [------------------------<-", @@ -504,7 +504,7 @@ "create.recipe.smoking_via_fan": "Bulk Rook", "create.recipe.smoking_via_fan.fan": "Ventilator achter vuur", "create.recipe.blasting_via_fan": "Bulk Smelten", - "create.recipe.blasting_via_fan.fan": ""Ventilator achter Lava", + "create.recipe.blasting_via_fan.fan": "Ventilator achter Lava", "create.recipe.pressing": "Persen", "create.recipe.mixing": "Mengen", "create.recipe.packing": "Compressen", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 6221a47f4..345a72f3e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 781" + "_": "Missing Localizations: 781", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 8fc7d33c9..d4a63d2ae 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 775" + "_": "Missing Localizations: 775", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 25580ddbb..e30433a0d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 35" + "_": "Missing Localizations: 35", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/main/java/com/simibubi/create/foundation/data/LangMerger.java b/src/main/java/com/simibubi/create/foundation/data/LangMerger.java index c8dac6003..6c672ee18 100644 --- a/src/main/java/com/simibubi/create/foundation/data/LangMerger.java +++ b/src/main/java/com/simibubi/create/foundation/data/LangMerger.java @@ -235,7 +235,7 @@ public class LangMerger implements IDataProvider { StringBuilder builder = new StringBuilder(); builder.append("{\n"); if (missingKeys != -1) - builder.append("\t\"_\": \"Missing Localizations: " + missingKeys + "\"\n"); + builder.append("\t\"_\": \"Missing Localizations: " + missingKeys + "\",\n"); data.forEach(builder::append); builder.append("\t\"_\": \"Thank you for translating Create!\"\n\n"); builder.append("}"); diff --git a/src/main/resources/assets/create/lang/nl_nl.json b/src/main/resources/assets/create/lang/nl_nl.json index d5d8c298e..8d9108149 100644 --- a/src/main/resources/assets/create/lang/nl_nl.json +++ b/src/main/resources/assets/create/lang/nl_nl.json @@ -194,7 +194,7 @@ "create.recipe.smoking_via_fan": "Bulk Rook", "create.recipe.smoking_via_fan.fan": "Ventilator achter vuur", "create.recipe.blasting_via_fan": "Bulk Smelten", - "create.recipe.blasting_via_fan.fan": "\"Ventilator achter Lava", + "create.recipe.blasting_via_fan.fan": "Ventilator achter Lava", "create.recipe.pressing": "Persen", "create.recipe.mixing": "Mengen", "create.recipe.packing": "Compressen",