From 0a8f8c49041e398749d36c09fc12ef86dc1ad2cf Mon Sep 17 00:00:00 2001
From: Zichao Lin <earthjasonlin@163.com>
Date: Wed, 15 Jul 2026 19:27:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(i18n):=20rename=20country=20labels=20to=20'?=
 =?UTF-8?q?=E5=AF=84=E5=87=BA=E5=9B=BD/=E5=88=B0=E8=BE=BE=E5=9B=BD'=20to?=
 =?UTF-8?q?=20avoid=20ambiguity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/locales/en.json              | 4 ++--
 app/locales/zh.json              | 4 ++--
 app/templates/postcard_form.html | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/locales/en.json b/app/locales/en.json
index e696947..dfa6e40 100644
--- a/app/locales/en.json
+++ b/app/locales/en.json
@@ -123,8 +123,8 @@
   "pc_form.number_hint": "Format: AB-1234567",
   "pc_form.status": "Status",
   "pc_form.recipient": "Recipient",
-  "pc_form.country": "Country",
-  "pc_form.country_from": "From",
+  "pc_form.country_from": "From country",
+  "pc_form.country_to": "To country",
   "pc_form.send_time": "Sent date",
   "pc_form.arrival_time": "Arrival date",
   "pc_form.sender": "Sender",
diff --git a/app/locales/zh.json b/app/locales/zh.json
index 3163d48..d074f93 100644
--- a/app/locales/zh.json
+++ b/app/locales/zh.json
@@ -123,8 +123,8 @@
   "pc_form.number_hint": "格式：AB-1234567",
   "pc_form.status": "状态",
   "pc_form.recipient": "收件人",
-  "pc_form.country": "国家/地区",
-  "pc_form.country_from": "寄出地",
+  "pc_form.country_from": "寄出国",
+  "pc_form.country_to": "到达国",
   "pc_form.send_time": "寄出时间",
   "pc_form.arrival_time": "到达时间",
   "pc_form.sender": "发件人",
diff --git a/app/templates/postcard_form.html b/app/templates/postcard_form.html
index 461d59b..edd2064 100644
--- a/app/templates/postcard_form.html
+++ b/app/templates/postcard_form.html
@@ -26,10 +26,10 @@
     <label>{{ 'pc_form.receive_time'|t(user.language) }} *</label>
     <input type="date" name="receive_time" value="{{ postcard.receive_time.strftime('%Y-%m-%d') if is_edit and postcard.receive_time else today }}">
 
-    <label>{{ 'pc_form.country_from'|t(user.language) }}</label>
+    <label>{{ 'pc_form.country_to_from'|t(user.language) }}</label>
     <input type="text" name="country_from" value="{{ postcard.country_from if is_edit and postcard.country_from else '' }}" maxlength="2" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
 
-    <label>{{ 'pc_form.country'|t(user.language) }}</label>
+    <label>{{ 'pc_form.country_to'|t(user.language) }}</label>
     <input type="text" name="country_to" value="{{ postcard.country_to if is_edit and postcard.country_to else (profile.country if profile else '') }}" maxlength="2" placeholder="JP" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
 
     {% else %}
@@ -61,10 +61,10 @@
         <input type="date" name="arrival_time" id="input-arrival" value="{{ postcard.arrival_time.strftime('%Y-%m-%d') if is_edit and postcard.arrival_time else '' }}" {% if is_new or (is_edit and edit_status=='sent') %}disabled{% endif %}>
     </div>
 
-    <label>{{ 'pc_form.country_from'|t(user.language) }}</label>
+    <label>{{ 'pc_form.country_to_from'|t(user.language) }}</label>
     <input type="text" name="country_from" value="{{ postcard.country_from if is_edit and postcard.country_from else (profile.country if profile else '') }}" maxlength="2" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
 
-    <label>{{ 'pc_form.country'|t(user.language) }}</label>
+    <label>{{ 'pc_form.country_to'|t(user.language) }}</label>
     <input type="text" name="country_to" value="{{ postcard.country_to if is_edit and postcard.country_to else '' }}" maxlength="2" placeholder="JP" style="width:80px;text-transform:uppercase" oninput="this.value=this.value.toUpperCase()">
 
     {% endif %}