You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by sh...@apache.org on 2024/04/07 03:22:17 UTC

(incubator-answer) branch dev updated: fix: Account setting label issue

This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git


The following commit(s) were added to refs/heads/dev by this push:
     new dc757d56 fix: Account setting label issue
dc757d56 is described below

commit dc757d561aa96ca5cf0bca944637fe1ec97c9bda
Author: sy-records <52...@qq52o.cn>
AuthorDate: Tue Mar 26 18:06:16 2024 +0800

    fix: Account setting label issue
---
 i18n/af_ZA.yaml                                                      | 4 +++-
 i18n/ar_SA.yaml                                                      | 4 +++-
 i18n/az_AZ.yaml                                                      | 4 +++-
 i18n/bal_BA.yaml                                                     | 4 +++-
 i18n/ban_ID.yaml                                                     | 4 +++-
 i18n/bn_BD.yaml                                                      | 4 +++-
 i18n/bs_BA.yaml                                                      | 4 +++-
 i18n/ca_ES.yaml                                                      | 4 +++-
 i18n/cs_CZ.yaml                                                      | 2 ++
 i18n/cy_GB.yaml                                                      | 2 ++
 i18n/da_DK.yaml                                                      | 2 ++
 i18n/de_DE.yaml                                                      | 2 ++
 i18n/el_GR.yaml                                                      | 4 +++-
 i18n/en_US.yaml                                                      | 2 ++
 i18n/es_ES.yaml                                                      | 2 ++
 i18n/fi_FI.yaml                                                      | 4 +++-
 i18n/he_IL.yaml                                                      | 4 +++-
 i18n/hi_IN.yaml                                                      | 2 ++
 i18n/hu_HU.yaml                                                      | 4 +++-
 i18n/hy_AM.yaml                                                      | 4 +++-
 i18n/id_ID.yaml                                                      | 2 ++
 i18n/ja_JP.yaml                                                      | 2 ++
 i18n/ko_KR.yaml                                                      | 2 ++
 i18n/nl_NL.yaml                                                      | 4 +++-
 i18n/no_NO.yaml                                                      | 4 +++-
 i18n/sk_SK.yaml                                                      | 2 ++
 i18n/sq_AL.yaml                                                      | 4 +++-
 i18n/sr_SP.yaml                                                      | 4 +++-
 i18n/te_IN.yaml                                                      | 2 ++
 i18n/tr_TR.yaml                                                      | 2 ++
 i18n/vi_VN.yaml                                                      | 2 ++
 i18n/zh_CN.yaml                                                      | 2 ++
 i18n/zh_TW.yaml                                                      | 2 ++
 ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx | 4 ++--
 34 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/i18n/af_ZA.yaml b/i18n/af_ZA.yaml
index 89c34f73..71162ef5 100644
--- a/i18n/af_ZA.yaml
+++ b/i18n/af_ZA.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/ar_SA.yaml b/i18n/ar_SA.yaml
index 28941e9e..2f686840 100644
--- a/i18n/ar_SA.yaml
+++ b/i18n/ar_SA.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/az_AZ.yaml b/i18n/az_AZ.yaml
index 483744f7..4270506a 100644
--- a/i18n/az_AZ.yaml
+++ b/i18n/az_AZ.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/bal_BA.yaml b/i18n/bal_BA.yaml
index 483744f7..4270506a 100644
--- a/i18n/bal_BA.yaml
+++ b/i18n/bal_BA.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/ban_ID.yaml b/i18n/ban_ID.yaml
index 483744f7..4270506a 100644
--- a/i18n/ban_ID.yaml
+++ b/i18n/ban_ID.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/bn_BD.yaml b/i18n/bn_BD.yaml
index 483744f7..4270506a 100644
--- a/i18n/bn_BD.yaml
+++ b/i18n/bn_BD.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/bs_BA.yaml b/i18n/bs_BA.yaml
index 483744f7..4270506a 100644
--- a/i18n/bs_BA.yaml
+++ b/i18n/bs_BA.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/ca_ES.yaml b/i18n/ca_ES.yaml
index 28941e9e..2f686840 100644
--- a/i18n/ca_ES.yaml
+++ b/i18n/ca_ES.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/cs_CZ.yaml b/i18n/cs_CZ.yaml
index e71eeda4..3e5bc495 100644
--- a/i18n/cs_CZ.yaml
+++ b/i18n/cs_CZ.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/cy_GB.yaml b/i18n/cy_GB.yaml
index a1c14f5f..8825ee2b 100644
--- a/i18n/cy_GB.yaml
+++ b/i18n/cy_GB.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/da_DK.yaml b/i18n/da_DK.yaml
index 0d48719d..88110a3e 100644
--- a/i18n/da_DK.yaml
+++ b/i18n/da_DK.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/de_DE.yaml b/i18n/de_DE.yaml
index 7ac93bfd..ed6b2ef2 100644
--- a/i18n/de_DE.yaml
+++ b/i18n/de_DE.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         Wir haben eine E-Mail an diese Adresse geschickt. Bitte befolge die Anweisungen zur Bestätigung.
       email:
+        label: E-Mail
+      new_email:
         label: Neue E-Mail
         msg: Neue E-Mail darf nicht leer sein.
       pass:
diff --git a/i18n/el_GR.yaml b/i18n/el_GR.yaml
index 28941e9e..2f686840 100644
--- a/i18n/el_GR.yaml
+++ b/i18n/el_GR.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/en_US.yaml b/i18n/en_US.yaml
index 943608dd..0221cfa0 100644
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@ -1029,6 +1029,8 @@ ui:
         We've sent an email to that address. Please follow the confirmation
         instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/es_ES.yaml b/i18n/es_ES.yaml
index 2ffbe74c..272b2208 100644
--- a/i18n/es_ES.yaml
+++ b/i18n/es_ES.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         Te hemos enviado un email a esa dirección. Por favor sigue las instrucciones de confirmación.
       email:
+        label: Correo
+      new_email:
         label: Nuevo correo
         msg: El nuevo correo no puede estar vacío.
       pass:
diff --git a/i18n/fi_FI.yaml b/i18n/fi_FI.yaml
index 28941e9e..2f686840 100644
--- a/i18n/fi_FI.yaml
+++ b/i18n/fi_FI.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/he_IL.yaml b/i18n/he_IL.yaml
index 28941e9e..2f686840 100644
--- a/i18n/he_IL.yaml
+++ b/i18n/he_IL.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/hi_IN.yaml b/i18n/hi_IN.yaml
index 0d48719d..88110a3e 100644
--- a/i18n/hi_IN.yaml
+++ b/i18n/hi_IN.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/hu_HU.yaml b/i18n/hu_HU.yaml
index 28941e9e..2f686840 100644
--- a/i18n/hu_HU.yaml
+++ b/i18n/hu_HU.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/hy_AM.yaml b/i18n/hy_AM.yaml
index 483744f7..4270506a 100644
--- a/i18n/hy_AM.yaml
+++ b/i18n/hy_AM.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/id_ID.yaml b/i18n/id_ID.yaml
index de2f95c4..e9277a5e 100644
--- a/i18n/id_ID.yaml
+++ b/i18n/id_ID.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/ja_JP.yaml b/i18n/ja_JP.yaml
index d1452052..bfb9b032 100644
--- a/i18n/ja_JP.yaml
+++ b/i18n/ja_JP.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/ko_KR.yaml b/i18n/ko_KR.yaml
index 1e584537..f0bc42c8 100644
--- a/i18n/ko_KR.yaml
+++ b/i18n/ko_KR.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/nl_NL.yaml b/i18n/nl_NL.yaml
index 28941e9e..2f686840 100644
--- a/i18n/nl_NL.yaml
+++ b/i18n/nl_NL.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/no_NO.yaml b/i18n/no_NO.yaml
index 28941e9e..2f686840 100644
--- a/i18n/no_NO.yaml
+++ b/i18n/no_NO.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/sk_SK.yaml b/i18n/sk_SK.yaml
index 7daf62b0..f3fa8dd4 100644
--- a/i18n/sk_SK.yaml
+++ b/i18n/sk_SK.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         Na túto adresu sme poslali e-mail. Postupujte podľa pokynov na potvrdenie.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/sq_AL.yaml b/i18n/sq_AL.yaml
index 483744f7..4270506a 100644
--- a/i18n/sq_AL.yaml
+++ b/i18n/sq_AL.yaml
@@ -708,7 +708,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/sr_SP.yaml b/i18n/sr_SP.yaml
index 28941e9e..2f686840 100644
--- a/i18n/sr_SP.yaml
+++ b/i18n/sr_SP.yaml
@@ -715,7 +715,9 @@ ui:
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
         label: Email
-        msg: Email cannot be empty.
+      new_email:
+        label: New email
+        msg: New email cannot be empty.
       password_title: Password
       current_pass:
         label: Current Password
diff --git a/i18n/te_IN.yaml b/i18n/te_IN.yaml
index dc22340c..8be7a385 100644
--- a/i18n/te_IN.yaml
+++ b/i18n/te_IN.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/tr_TR.yaml b/i18n/tr_TR.yaml
index 0460fda5..c9cfe1c9 100644
--- a/i18n/tr_TR.yaml
+++ b/i18n/tr_TR.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/vi_VN.yaml b/i18n/vi_VN.yaml
index d28041ce..acf8084c 100644
--- a/i18n/vi_VN.yaml
+++ b/i18n/vi_VN.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         We've sent an email to that address. Please follow the confirmation instructions.
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/i18n/zh_CN.yaml b/i18n/zh_CN.yaml
index f4d142ca..0a6258d6 100644
--- a/i18n/zh_CN.yaml
+++ b/i18n/zh_CN.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         邮件已发送。请根据指引完成验证。
       email:
+        label: 电子邮件地址
+      new_email:
         label: 新的电子邮件地址
         msg: 新邮箱不能为空。
       pass:
diff --git a/i18n/zh_TW.yaml b/i18n/zh_TW.yaml
index c0377af7..4b5cce48 100644
--- a/i18n/zh_TW.yaml
+++ b/i18n/zh_TW.yaml
@@ -999,6 +999,8 @@ ui:
       change_email_info: >-
         我們已經寄出一封郵件至此電子郵件地址,請遵照說明進行確認。
       email:
+        label: Email
+      new_email:
         label: New email
         msg: New email cannot be empty.
       pass:
diff --git a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
index 5672782b..ac42f078 100644
--- a/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
+++ b/ui/src/pages/Users/Settings/Account/components/ModifyEmail/index.tsx
@@ -66,7 +66,7 @@ const Index: FC = () => {
       formData.e_mail = {
         value: '',
         isInvalid: true,
-        errorMsg: t('email.msg'),
+        errorMsg: t('new_email.msg'),
       };
     }
 
@@ -194,7 +194,7 @@ const Index: FC = () => {
           </Form.Group>
 
           <Form.Group controlId="newEmail" className="mb-3">
-            <Form.Label>{t('email.label')}</Form.Label>
+            <Form.Label>{t('new_email.label')}</Form.Label>
             <Form.Control
               autoComplete="off"
               required