From 8bc9163def6a2f7b27d4447e817b80b9ffbdbbf3 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Tue, 15 Jun 2021 22:12:50 +0800
Subject: [PATCH] Improve i18n.

---
 web/src/ResetModal.js      | 2 +-
 web/src/auth/ForgetPage.js | 4 ++--
 web/src/auth/LoginPage.js  | 2 +-
 web/src/auth/Provider.js   | 2 +-
 web/src/auth/SignupPage.js | 8 ++++----
 web/src/locales/en.json    | 8 +++-----
 web/src/locales/zh.json    | 8 +++-----
 7 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/web/src/ResetModal.js b/web/src/ResetModal.js
index 5064f8c5..1c3e45c7 100644
--- a/web/src/ResetModal.js
+++ b/web/src/ResetModal.js
@@ -85,7 +85,7 @@ export const ResetModal = (props) => {
           </Row>
           <Row style={{width: "100%", marginBottom: "20px"}}>
             <CountDownInput
-              defaultButtonText={i18next.t("user:Send Code")}
+              defaultButtonText={i18next.t("user:Send code")}
               textBefore={i18next.t("user:Code You Received")}
               placeHolder={i18next.t("user:Enter your code")}
               onChange={setCode}
diff --git a/web/src/auth/ForgetPage.js b/web/src/auth/ForgetPage.js
index cedad026..b925bf8c 100644
--- a/web/src/auth/ForgetPage.js
+++ b/web/src/auth/ForgetPage.js
@@ -320,7 +320,7 @@ class ForgetPage extends React.Component {
                   <CountDownInput
                       disabled={this.state.username === "" || this.state.verifyType === ""}
                       placeHolder={i18next.t("forget:Verify code")}
-                      defaultButtonText={i18next.t("forget:send code")}
+                      defaultButtonText={i18next.t("user:Send code")}
                       onButtonClick={UserBackend.sendCode}
                       onButtonClickArgs={[
                         this.state.email,
@@ -335,7 +335,7 @@ class ForgetPage extends React.Component {
                   <CountDownInput
                       disabled={this.state.username === "" || this.state.verifyType === ""}
                       placeHolder={i18next.t("forget:Verify code")}
-                      defaultButtonText={i18next.t("forget:send code")}
+                      defaultButtonText={i18next.t("User:Send code")}
                       onButtonClick={UserBackend.sendCode}
                       onButtonClickArgs={[
                         this.state.phone,
diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js
index b958006d..00f65822 100644
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@@ -335,7 +335,7 @@ class LoginPage extends React.Component {
     return (
       <Row>
         <Col span={24} style={{display: "flex", justifyContent: "center"}}>
-          <div style={{marginTop: "80px", textAlign: "center"}}>
+          <div style={{marginTop: "80px", marginBottom: "50px", textAlign: "center"}}>
             {
               Setting.renderHelmet(application)
             }
diff --git a/web/src/auth/Provider.js b/web/src/auth/Provider.js
index a846edca..3055f6e6 100644
--- a/web/src/auth/Provider.js
+++ b/web/src/auth/Provider.js
@@ -43,7 +43,7 @@ const WeiboAuthScope = "email";
 const WeiboAuthUri = "https://api.weibo.com/oauth2/authorize";
 const WeiboAuthLogo = `${StaticBaseUrl}/img/social_weibo.png`;
 
-const GiteeAuthScope = "user_info emails";
+const GiteeAuthScope = "user_info,emails";
 const GiteeAuthUri = "https://gitee.com/oauth/authorize";
 const GiteeAuthLogo = `${StaticBaseUrl}/img/social_gitee.png`;
 
diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js
index 94e6561f..71bffe27 100644
--- a/web/src/auth/SignupPage.js
+++ b/web/src/auth/SignupPage.js
@@ -240,14 +240,14 @@ class SignupPage extends React.Component {
         </Form.Item>
         <Form.Item
           name="emailCode"
-          label={i18next.t("signup:email code")}
+          label={i18next.t("signup:Email code")}
           rules={[{
             required: true,
             message: i18next.t("signup:Please input your verification code!"),
           }]}
         >
           <CountDownInput
-            defaultButtonText={i18next.t("signup:send code")}
+            defaultButtonText={i18next.t("user:Send code")}
             onButtonClick={UserBackend.sendCode}
             onButtonClickArgs={[this.state.email, "email", application?.organizationObj.owner + "/" + application?.organizationObj.name]}
             coolDownTime={60}
@@ -309,7 +309,7 @@ class SignupPage extends React.Component {
         </Form.Item>
         <Form.Item
           name="phoneCode"
-          label={i18next.t("signup:phone code")}
+          label={i18next.t("signup:Phone code")}
           rules={[
             {
               required: true,
@@ -318,7 +318,7 @@ class SignupPage extends React.Component {
           ]}
         >
           <CountDownInput
-            defaultButtonText={i18next.t("signup:send code")}
+            defaultButtonText={i18next.t("user:Send code")}
             onButtonClick={UserBackend.sendCode}
             onButtonClickArgs={[this.state.phone, "phone", application.organizationObj.owner + "/" + application.organizationObj.name]}
             coolDownTime={60}
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index a587200b..925106a6 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -54,9 +54,8 @@
     "Your account has been created!": "Your account has been created!",
     "Please click the below button to sign in": "Please click the below button to sign in",
     "code sent": "code sent",
-    "send code": "send code",
-    "email code": "email code",
-    "phone code": "phone code",
+    "Email code": "Email code",
+    "Phone code": "Phone code",
     "PhoneCode has not been sent yet!": "Phone code has not been sent yet!",
     "EmailCode has not been sent yet!": "Email code has not been sent yet!",
     "PhoneYou should verify your code in 10 min!": "You should verify your phone verification code in 10 min!",
@@ -148,7 +147,7 @@
     "input password": "input password",
     "Reset Email...": "Reset Email...",
     "Reset Phone...": "Reset Phone...",
-    "Send Code": "Send Code",
+    "Send code": "Send code",
     "Empty email": "Empty Email",
     "Empty phone": "Empty Phone",
     "Empty Code": "Empty Code",
@@ -191,7 +190,6 @@
     "Please input your Email/Phone string!": "Please input your Email/Phone string!",
     "Please input your verification code!": "Please input your verification code!",
     "Your confirmed password is inconsistent with the password!": "Your confirmed password is inconsistent with the password!",
-    "send code": "send code",
     "Account": "Account",
     "Verify": "Verify",
     "Retrieve password": "Retrieve password",
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index ec326e1b..17f4a5d5 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -54,9 +54,8 @@
     "Your account has been created!": "您的账号已创建！",
     "Please click the below button to sign in": "请点击下方按钮登录",
     "code sent": "验证码已发送",
-    "send code": "发送验证码",
-    "email code": "邮箱验证码",
-    "phone code": "手机验证码",
+    "Email code": "邮箱验证码",
+    "Phone code": "手机验证码",
     "PhoneCode has not been sent yet!": "尚未发送验证码至手机",
     "EmailCode has not been sent yet!": "尚未发送验证码至邮箱",
     "PhoneYou should verify your code in 10 min!": "你应该在 10 分钟之内验证手机号",
@@ -148,7 +147,7 @@
     "input password": "输入密码",
     "Reset Email...": "重置邮箱...",
     "Reset Phone...": "重置手机号...",
-    "Send Code": "发送验证码",
+    "Send code": "发送验证码",
     "Empty email": "邮箱为空",
     "Empty phone": "手机号为空",
     "Empty Code": "验证码为空",
@@ -191,7 +190,6 @@
     "Please input your Email/Phone string!": "请输入您的邮箱/手机号！",
     "Please input your verification code!": "请输入您的验证码",
     "Your confirmed password is inconsistent with the password!": "您确认的密码与密码不一致！",
-    "send code": "发送验证码",
     "Verify code": "验证码",
     "Password": "密码",
     "Next Step": "下一步",