From 06c3ace58df83918851d16fecb9dbc0afb316f27 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Thu, 8 Aug 2019 08:54:27 -0500
Subject: [PATCH] Change `charge` field placeholders to use currency codes
 instead of symbols (close #6729)

---
 data/presets.yaml                    | 4 ++--
 data/presets/fields.json             | 4 ++--
 data/presets/fields/charge_fee.json  | 2 +-
 data/presets/fields/charge_toll.json | 2 +-
 dist/locales/en.json                 | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index a910749ec..74d47e2c1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -358,12 +358,12 @@ en:
         # charge=*
         label: Fee Amount
         # charge_fee field placeholder
-        placeholder: '€1, $5, ¥10…'
+        placeholder: '1 EUR, 5 USD, 10 JPY…'
       charge_toll:
         # charge=*
         label: Toll Amount
         # charge_toll field placeholder
-        placeholder: '€1, $5, ¥10…'
+        placeholder: '1 EUR, 5 USD, 10 JPY…'
       check_date:
         # check_date=*
         label: Last Checked Date
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b06d4c9e7..fec6bba3b 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -59,8 +59,8 @@
     "capacity": {"key": "capacity", "type": "number", "minValue": 0, "label": "Capacity", "placeholder": "50, 100, 200..."},
     "cash_in": {"key": "cash_in", "type": "check", "label": "Cash In"},
     "castle_type": {"key": "castle_type", "type": "combo", "label": "Type"},
-    "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "€1, $5, ¥10…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
-    "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "€1, $5, ¥10…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}},
+    "charge_fee": {"key": "charge", "type": "text", "label": "Fee Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
+    "charge_toll": {"key": "charge", "type": "text", "label": "Toll Amount", "placeholder": "1 EUR, 5 USD, 10 JPY…", "prerequisiteTag": {"key": "toll", "valueNot": "no"}},
     "check_date": {"key": "check_date", "type": "text", "label": "Last Checked Date"},
     "clothes": {"key": "clothes", "type": "semiCombo", "label": "Clothes"},
     "club": {"key": "club", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/charge_fee.json b/data/presets/fields/charge_fee.json
index ca63eb11b..e432b5333 100644
--- a/data/presets/fields/charge_fee.json
+++ b/data/presets/fields/charge_fee.json
@@ -2,7 +2,7 @@
     "key": "charge",
     "type": "text",
     "label": "Fee Amount",
-    "placeholder": "€1, $5, ¥10…",
+    "placeholder": "1 EUR, 5 USD, 10 JPY…",
     "prerequisiteTag": {
         "key": "fee",
         "valueNot": "no"
diff --git a/data/presets/fields/charge_toll.json b/data/presets/fields/charge_toll.json
index 265d81830..5f3eef929 100644
--- a/data/presets/fields/charge_toll.json
+++ b/data/presets/fields/charge_toll.json
@@ -2,7 +2,7 @@
     "key": "charge",
     "type": "text",
     "label": "Toll Amount",
-    "placeholder": "€1, $5, ¥10…",
+    "placeholder": "1 EUR, 5 USD, 10 JPY…",
     "prerequisiteTag": {
         "key": "toll",
         "valueNot": "no"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 450b92155..40475c4ba 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2711,11 +2711,11 @@
                 },
                 "charge_fee": {
                     "label": "Fee Amount",
-                    "placeholder": "€1, $5, ¥10…"
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
                 },
                 "charge_toll": {
                     "label": "Toll Amount",
-                    "placeholder": "€1, $5, ¥10…"
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
                 },
                 "check_date": {
                     "label": "Last Checked Date"