From 8b5826f315224251d5a99bc5bbb50fb95ccd4a59 Mon Sep 17 00:00:00 2001
From: Misode <Misoloo64@gmail.com>
Date: Tue, 20 Aug 2019 18:50:11 +0200
Subject: [PATCH] Split add/remove translation strings

---
 index.html         | 40 ++++++++++++++++++++--------------------
 locales/en.json    | 31 ++++++++++++++++++++++++-------
 locales/zh-CN.json | 29 +++++++++++++++++++++++------
 3 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/index.html b/index.html
index b087584d..03d84eac 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,7 @@
     <div class="row my-4">
       <div class="col-12 col-lg-7 mb-3 structure-container">
         <div class="input-group">
-          <button type="button" class="btn btn-success d-block mr-3 float-left" onclick="addPool(this)" data-i18n="add;[append]pool"></button>
+          <button type="button" class="btn btn-success d-block mr-3 float-left" onclick="addPool(this)" data-i18n="add_pool"></button>
           <div class="input-group-prepend">
             <span class="input-group-text rounded-left" data-i18n="$table.type"></span>
           </div>
@@ -73,9 +73,9 @@
   <div class="d-none">
     <div id="poolTemplate" class="card bg-success text-white mt-3 pool" data-field="pools[]">
       <div class="card-header pb-1">
-        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove;[append]pool"></button>
-        <button type="button" class="btn btn-light mr-3 mb-2 float-left" onclick="addEntry(this)" data-i18n="add;[append]entry"></button>
-        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add;[append]condition"></button>
+        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove_pool"></button>
+        <button type="button" class="btn btn-light mr-3 mb-2 float-left" onclick="addEntry(this)" data-i18n="add_entry"></button>
+        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add_condition"></button>
       </div>
       <div class="card-body">
         <div class="input-group rolls" data-type="range" data-field="rolls">
@@ -122,9 +122,9 @@
     </div>
     <div id="entryTemplate" class="card mt-3 entry" data-field="entries[]">
       <div class="card-header pb-1">
-        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove;[append]entry"></button>
-        <button type="button" class="btn btn-secondary mr-3 mb-2 float-left" onclick="addFunction(this)" data-i18n="add;[append]function"></button>
-        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add;[append]condition"></button>
+        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove_entry"></button>
+        <button type="button" class="btn btn-secondary mr-3 mb-2 float-left" onclick="addFunction(this)" data-i18n="add_function"></button>
+        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add_condition"></button>
       </div>
       <div class="card-body">
         <div class="input-group" data-type="enum" data-field="type">
@@ -161,14 +161,14 @@
           <input type="text" class="form-control" onchange="updateField(this)" onclick="this.select()">
         </div>
         <div class="input-group mt-3 entry-children d-none">
-          <button type="button" class="btn btn-outline-success" onclick="addChild(this)" data-i18n="add;[append]child"></button>
+          <button type="button" class="btn btn-outline-success" onclick="addChild(this)" data-i18n="add_child"></button>
         </div>
       </div>
     </div>
     <div id="functionTemplate" class="card bg-secondary mt-3 function" data-field="functions[]">
       <div class="card-header pb-1">
-        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove;[append]function"></button>
-        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add;[append]condition"></button>
+        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove_function"></button>
+        <button type="button" class="btn btn-info mr-3 mb-2 float-left" onclick="addCondition(this)" data-i18n="add_condition"></button>
       </div>
       <div class="card-body">
         <div class="input-group" data-type="enum" data-field="function">
@@ -325,7 +325,7 @@
           <input type="text" class="form-control" onchange="updateField(this)" onclick="this.select()">
         </div>
         <div class="input-group mt-3 function-attributes d-none">
-          <button type="button" class="btn btn-dark" onclick="addModifier(this)" data-i18n="add;[append]modifier"></button>
+          <button type="button" class="btn btn-dark" onclick="addModifier(this)" data-i18n="add_modifier"></button>
         </div>
         <div class="input-group mt-3 function-source d-none" data-type="enum" data-field="source">
           <div class="input-group-prepend">
@@ -354,7 +354,7 @@
           <input type="text" class="form-control range max rounded-right" value="2" onchange="updateField(this)" onclick="this.select()">
         </div>
         <div class="input-group mt-3 function-entries d-none">
-          <button type="button" class="btn btn-light" onclick="addEntry(this)" data-i18n="add;[append]entry"></button>
+          <button type="button" class="btn btn-light" onclick="addEntry(this)" data-i18n="add_entry"></button>
         </div>
         <div class="input-group mt-3 function-lore d-none" data-type="json-list" data-field="lore">
           <textarea class="form-control code" onchange="updateLoreField(this)" rows=3></textarea>
@@ -416,7 +416,7 @@
     </div>
     <div id="modifierTemplate" class="card bg-dark mt-3 modifier" data-field="modifiers[]">
       <div class="card-body">
-        <button type="button" class="btn btn-danger mb-3 float-right" onclick="removeField(this)" data-i18n="remove;[append]modifier"></button>
+        <button type="button" class="btn btn-danger mb-3 float-right" onclick="removeField(this)" data-i18n="remove_modifier"></button>
         <div class="input-group" data-type="enum" data-field="attribute">
           <div class="input-group-prepend">
             <span class="input-group-text" data-i18n="$modifier.attribute"></span>
@@ -497,7 +497,7 @@
     </div>
     <div id="operationTemplate" class="card bg-dark mt-3 operation" data-field="ops[]">
       <div class="card-header pb-1">
-        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove;[append]operation"></button>
+        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove_operation"></button>
       </div>
       <div class="card-body">
         <div class="input-group" data-type="string" data-field="source">
@@ -526,7 +526,7 @@
     </div>
     <div id="conditionTemplate" class="card mt-3 bg-info condition" data-field="conditions[]">
       <div class="card-header pb-1">
-        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove;[append]condition"></button>
+        <button type="button" class="btn btn-danger mb-2 float-right" onclick="removeField(this)" data-i18n="remove_condition"></button>
       </div>
       <div class="card-body">
         <div class="input-group" data-type="enum" data-field="condition">
@@ -584,13 +584,13 @@
           </div>
           <input type="text" class="form-control">
           <div class="input-group-append">
-            <button class="btn btn-dark" type="button" onclick="addScore(this)" data-i18n="add;[append]score"></button>
+            <button class="btn btn-dark" type="button" onclick="addScore(this)" data-i18n="add_score"></button>
           </div>
         </div>
         <div class="mt-3 scores-list d-none">
         </div>
         <div class="input-group mt-3 condition-terms d-none">
-          <button type="button" class="btn btn-light" onclick="addTerm(this)" data-i18n="add;[append]$condition.$terms.term"></button>
+          <button type="button" class="btn btn-light" onclick="addTerm(this)" data-i18n="add_term"></button>
         </div>
         <div class="input-group mt-3 condition-block d-none" data-type="string" data-field="block">
           <div class="input-group-prepend">
@@ -604,7 +604,7 @@
           </div>
           <input type="text" class="form-control">
           <div class="input-group-append">
-            <button class="btn btn-dark" type="button" onclick="addBlockProperty(this)" data-i18n="add;[append]block_state"></button>
+            <button class="btn btn-dark" type="button" onclick="addBlockProperty(this)" data-i18n="add_block_state"></button>
           </div>
         </div>
         <div class="mt-3 property-list d-none">
@@ -799,7 +799,7 @@
           <textarea type="text" class="form-control nbt code" onchange="updateField(this)" onclick="this.select()"></textarea>
         </div>
         <div class="input-group mt-3">
-          <button class="btn btn-dark" type="button" onclick="addConditionEnchantment(this)" data-i18n="add;[append]enchantment"></button>
+          <button class="btn btn-dark" type="button" onclick="addConditionEnchantment(this)" data-i18n="add_enchantment"></button>
         </div>
       </div>
     </div>
@@ -927,7 +927,7 @@
     </div>
     <div id="enchantmentTemplate" class="card bg-dark mt-3 enchantment" data-field="enchantments[]">
       <div class="card-body">
-        <button type="button" class="btn btn-danger mb-3 float-right" onclick="removeField(this)" data-i18n="remove;[append]enchantment"></button>
+        <button type="button" class="btn btn-danger mb-3 float-right" onclick="removeField(this)" data-i18n="remove_enchantment"></button>
         <div class="input-group" data-type="enum" data-field="enchantment">
           <div class="input-group-prepend">
             <span class="input-group-text" data-i18n="enchantment"></span>
diff --git a/locales/en.json b/locales/en.json
index e6700c45..d788bc99 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -13,10 +13,7 @@
 		"random_chance_with_looting": "Random Chance with Looting",
 		"table_bonus": "Table Bonus",
 		"killed_by_player": "Killed by Player",
-		"survives_explosion": "Survives Explosion",
-		"$terms": {
-			"term": "Term"
-		}
+		"survives_explosion": "Survives Explosion"
 	},
 	"$damage": {
 		"damage_type": "Damage Type",
@@ -228,7 +225,17 @@
 	},
 	"2_spaces": "2 Spaces",
 	"4_spaces": "4 Spaces",
-	"add": "Add ",
+	"add_block_state": "Add Block State",
+	"add_child": "Add Child",
+	"add_condition": "Add Condition",
+	"add_enchantment": "Add Enchantment",
+	"add_entry": "Add Entry",
+	"add_function": "Add Function",
+	"add_modifier": "Add Modifier",
+	"add_operation": "Add Operation",
+	"add_pool": "Add Pool",
+	"add_score": "Add Score",
+	"add_term": "Add Term",
 	"author": "by Misode",
 	"biome": "Biome",
 	"block": "Block",
@@ -265,14 +272,24 @@
 	"position": "Position",
 	"potion": "Potion",
 	"raining": "Raining",
-	"remove": "Remove ",
+	"remove": "Remove",
+	"remove_block_state": "Remove Block State",
+	"remove_condition": "Remove Condition",
+	"remove_enchantment": "Remove Enchantment",
+	"remove_entry": "Remove Entry",
+	"remove_function": "Remove Function",
+	"remove_modifier": "Remove Modifier",
+	"remove_operation": "Remove Operation",
+	"remove_pool": "Remove Pool",
+	"remove_score": "Remove Score",
+	"remove_term": "Remove Term",
 	"score": "Score",
 	"share": "Share",
 	"show_source": "Show Source",
 	"source": "Source",
-	"table": "Loot Table",
 	"tabs": "Tabs",
 	"tag": "Tag",
+	"term": "Term",
 	"thundering": "Thundering",
 	"title": "Loot Table Generator",
 	"treasure": "Treasure",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index ad67b7fd..cbbe0dad 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -13,10 +13,7 @@
 		"random_chance_with_looting": "受抢夺附魔影响的随机概率",
 		"table_bonus": "附魔奖励",
 		"killed_by_player": "被玩家击杀",
-		"survives_explosion": "未被爆炸破坏",
-		"$terms": {
-			"term": "条件"
-		}
+		"survives_explosion": "未被爆炸破坏"
 	},
 	"$damage": {
 		"damage_type": "伤害类型",
@@ -228,7 +225,17 @@
 	},
 	"2_spaces": "2 空格缩进",
 	"4_spaces": "4 空格缩进",
-	"add": "添加",
+	"add_block_state": "添加方块状态",
+	"add_child": "添加子项目",
+	"add_condition": "添加条件",
+	"add_enchantment": "添加附魔",
+	"add_entry": "添加项目",
+	"add_function": "添加函数",
+	"add_modifier": "添加属性修饰器",
+	"add_operation": "添加操作",
+	"add_pool": "添加随机池",
+	"add_score": "添加分数",
+	"add_term": "添加条件",
 	"author": "作者 @Misode",
 	"biome": "生物群系",
 	"block": "方块",
@@ -266,13 +273,23 @@
 	"potion": "药水",
 	"raining": "下雨",
 	"remove": "移除",
+	"add_block_state": "移除方块状态",
+	"remove_condition": "移除条件",
+	"remove_enchantment": "移除附魔",
+	"remove_entry": "移除项目",
+	"remove_function": "移除函数",
+	"remove_modifier": "移除属性修饰器",
+	"remove_operation": "移除操作",
+	"remove_pool": "移除随机池",
+	"add_score": "移除分数",
+	"remove_term": "移除条件",
 	"score": "分数",
 	"share": "分享",
 	"show_source": "显示源代码",
 	"source": "源",
-	"table": "战利品表",
 	"tabs": "Tab 缩进",
 	"tag": "标签",
+	"term": "条件",
 	"thundering": "雷雨",
 	"title": "战利品表生成器",
 	"treasure": "宝藏型附魔",