Fix forget page i18n

web/src/ProviderEditPage.js

@@ -598,7 +598,7 @@ class ProviderEditPage extends React.Component {
               </Row>
               <Row style={{marginTop: "20px"}} >
                 <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-                  {Setting.getLabel(i18next.t("provider:Email Title"), i18next.t("provider:Email Title - Tooltip"))} :
+                  {Setting.getLabel(i18next.t("provider:Email title"), i18next.t("provider:Email title - Tooltip"))} :
                 </Col>
                 <Col span={22} >
                   <Input value={this.state.provider.title} onChange={e => {
@@ -608,7 +608,7 @@ class ProviderEditPage extends React.Component {
               </Row>
               <Row style={{marginTop: "20px"}} >
                 <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-                  {Setting.getLabel(i18next.t("provider:Email Content"), i18next.t("provider:Email Content - Tooltip"))} :
+                  {Setting.getLabel(i18next.t("provider:Email content"), i18next.t("provider:Email content - Tooltip"))} :
                 </Col>
                 <Col span={22} >
                   <TextArea autoSize={{minRows: 3, maxRows: 100}} value={this.state.provider.content} onChange={e => {
@@ -631,7 +631,7 @@ class ProviderEditPage extends React.Component {
                 <Button style={{marginLeft: "10px", marginBottom: "5px"}} type="primary"
                   disabled={!Setting.isValidEmail(this.state.provider.receiver)}
                   onClick={() => ProviderEditTestEmail.sendTestEmail(this.state.provider, this.state.provider.receiver)} >
-                  {i18next.t("provider:Send Test Email")}
+                  {i18next.t("provider:Send Testing Email")}
                 </Button>
               </Row>
             </React.Fragment>
@@ -687,7 +687,7 @@ class ProviderEditPage extends React.Component {
                   <Button style={{marginLeft: "10px", marginBottom: "5px"}} type="primary"
                     disabled={!Setting.isValidPhone(this.state.provider.receiver)}
                     onClick={() => ProviderEditTestSms.sendTestSms(this.state.provider, "+" + Setting.getCountryCode(this.state.provider.content) + this.state.provider.receiver)} >
-                    {i18next.t("provider:SMS Send Test")}
+                    {i18next.t("provider:Send Testing SMS")}
                   </Button>
                 </Col>
               </Row>

web/src/TestSmsWidget.js

@@ -19,7 +19,7 @@ export function sendTestSms(provider, phone) {
   testSmsProvider(provider, phone)
     .then((res) => {
       if (res.status === "ok") {
-        Setting.showMessage("success", `${i18next.t("provider:SMS send Successfully")}`);
+        Setting.showMessage("success", `${i18next.t("provider:SMS sent successfully")}`);
       } else {
         Setting.showMessage("error", res.msg);
       }

web/src/auth/ForgetPage.js

@@ -212,9 +212,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("application:Please input your application!"),
-                    "forget:Please input your application!"
-                  ),
                 },
               ]}
             />
@@ -224,9 +222,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("application:Please input your organization!"),
-                    "forget:Please input your organization!"
-                  ),
                 },
               ]}
             />
@@ -235,9 +231,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("forget:Please input your username!"),
-                    "forget:Please input your username!"
-                  ),
                   whitespace: true,
                 },
               ]}
@@ -287,9 +281,7 @@ class ForgetPage extends React.Component {
             rules={[
               {
                 required: true,
-                message: i18next.t(
+                message: i18next.t("application:Please input your application!"),
-                  "forget:Please input your application!"
-                ),
               },
             ]}
           />
@@ -299,9 +291,7 @@ class ForgetPage extends React.Component {
             rules={[
               {
                 required: true,
-                message: i18next.t(
+                message: i18next.t("application:Please input your organization!"),
-                  "forget:Please input your organization!"
-                ),
               },
             ]}
           />
@@ -327,9 +317,7 @@ class ForgetPage extends React.Component {
             rules={[
               {
                 required: true,
-                message: i18next.t(
+                message: i18next.t("code:Please input your verification code!"),
-                  "code:Please input your verification code!"
-                ),
               },
             ]}
           >
@@ -377,9 +365,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("application:Please input your application!"),
-                    "forget:Please input your application!"
-                  ),
                 },
               ]}
             />
@@ -389,9 +375,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("application:Please input your organization!"),
-                    "forget:Please input your organization!"
-                  ),
                 },
               ]}
             />
@@ -401,9 +385,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("login:Please input your password!"),
-                    "forget:Please input your password!"
-                  ),
                 },
               ]}
               hasFeedback
@@ -421,9 +403,7 @@ class ForgetPage extends React.Component {
               rules={[
                 {
                   required: true,
-                  message: i18next.t(
+                  message: i18next.t("signup:Please confirm your password!"),
-                    "forget:Please confirm your password!"
-                  ),
                 },
                 ({getFieldValue}) => ({
                   validator(rule, value) {
@@ -431,9 +411,7 @@ class ForgetPage extends React.Component {
                       return Promise.resolve();
                     }
                     return Promise.reject(
-                      i18next.t(
+                      i18next.t("signup:Your confirmed password is inconsistent with the password!")
-                        "forget:Your confirmed password is inconsistent with the password!"
-                      )
                     );
                   },
                 }),
@@ -497,11 +475,11 @@ class ForgetPage extends React.Component {
                         icon: <UserOutlined />,
                       },
                       {
-                        title: i18next.t("forget:Account"),
+                        title: i18next.t("forget:Verify"),
                         icon: <SolutionOutlined />,
                       },
                       {
-                        title: i18next.t("forget:Account"),
+                        title: i18next.t("forget:Reset"),
                         icon: <KeyOutlined />,
                       },
                     ]}

web/src/locales/de/data.json

@@ -514,10 +514,10 @@
     "Domain": "Domäne",
     "Domain - Tooltip": "Storage endpoint custom domain",
     "Edit Provider": "Anbieter bearbeiten",
-    "Email Content": "Email content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Unique string-style identifier",
+    "Email content - Tooltip": "Unique string-style identifier",
-    "Email Title": "E-Mail-Titel",
+    "Email title": "E-Mail-Titel",
-    "Email Title - Tooltip": "Unique string-style identifier",
+    "Email title - Tooltip": "Unique string-style identifier",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Tooltip",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Schild Name",
     "Sign Name - Tooltip": "Unique string-style identifier",
     "Sign request": "Signaturanfrage",

web/src/locales/en/data.json

@@ -311,7 +311,6 @@
     "No account?": "No account?",
     "Or sign in with another account": "Or sign in with another account",
     "Password": "Password",
-    "Password - Tooltip": "Password - Tooltip",
     "Please input your Email or Phone!": "Please input your Email or Phone!",
     "Please input your code!": "Please input your code!",
     "Please input your password!": "Please input your password!",
@@ -514,10 +513,11 @@
     "Domain": "Domain",
     "Domain - Tooltip": "Domain - Tooltip",
     "Edit Provider": "Edit Provider",
-    "Email Content": "Email Content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Email Content - Tooltip",
+    "Email content - Tooltip": "Email content - Tooltip",
-    "Email Title": "Email Title",
+    "Email title": "Email title",
-    "Email Title - Tooltip": "Email Title - Tooltip",
+    "Email title - Tooltip": "Email title - Tooltip",
+    "Email sent successfully": "Email sent successfully",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -550,8 +550,12 @@
     "Region endpoint for Intranet": "Region endpoint for Intranet",
     "Required": "Required",
     "SAML 2.0 Endpoint (HTTP)": "SAML 2.0 Endpoint (HTTP)",
+    "Send Testing SMS": "Send Testing SMS",
+    "SMS Test": "SMS Test",
+    "SMS Test - Tooltip": "SMS Test - Tooltip",
     "SMS account": "SMS account",
     "SMS account - Tooltip": "SMS account - Tooltip",
+    "SMS sent successfully": "SMS sent successfully",
     "SP ACS URL": "SP ACS URL",
     "SP ACS URL - Tooltip": "SP ACS URL - Tooltip",
     "SP Entity ID": "SP Entity ID",
@@ -563,7 +567,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Tooltip",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Sign Name",
     "Sign Name - Tooltip": "Sign Name - Tooltip",
     "Sign request": "Sign request",
@@ -649,7 +653,6 @@
     "The input is not valid Email!": "The input is not valid Email!",
     "The input is not valid Phone!": "The input is not valid Phone!",
     "Username": "Username",
-    "Username - Tooltip": "Username - Tooltip",
     "Your account has been created!": "Your account has been created!",
     "Your confirmed password is inconsistent with the password!": "Your confirmed password is inconsistent with the password!",
     "sign in now": "sign in now"

web/src/locales/es/data.json

@@ -514,10 +514,10 @@
     "Domain": "Dominio",
     "Domain - Tooltip": "Dominio - Tooltip",
     "Edit Provider": "Editar Proveedor",
-    "Email Content": "Contenido del Email",
+    "Email content": "Contenido del Email",
-    "Email Content - Tooltip": "Contenido del Email - Tooltip",
+    "Email content - Tooltip": "Contenido del Email - Tooltip",
-    "Email Title": "Titulo del Email",
+    "Email title": "Titulo del Email",
-    "Email Title - Tooltip": "Titulo del Email - Tooltip",
+    "Email title - Tooltip": "Titulo del Email - Tooltip",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Tooltip",
-    "Send Test Email": "Enviar email de prueba",
+    "Send Testing Email": "Enviar email de prueba",
     "Sign Name": "Sign Name",
     "Sign Name - Tooltip": "Sign Name - Tooltip",
     "Sign request": "Sign request",

web/src/locales/fr/data.json

@@ -514,10 +514,10 @@
     "Domain": "Domaine",
     "Domain - Tooltip": "Storage endpoint custom domain",
     "Edit Provider": "Modifier le fournisseur",
-    "Email Content": "Email content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Unique string-style identifier",
+    "Email content - Tooltip": "Unique string-style identifier",
-    "Email Title": "Titre de l'e-mail",
+    "Email title": "Titre de l'e-mail",
-    "Email Title - Tooltip": "Unique string-style identifier",
+    "Email title - Tooltip": "Unique string-style identifier",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Infobulle",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Nom du panneau",
     "Sign Name - Tooltip": "Unique string-style identifier",
     "Sign request": "Demande de signature",

web/src/locales/ja/data.json

@@ -514,10 +514,10 @@
     "Domain": "ドメイン",
     "Domain - Tooltip": "Storage endpoint custom domain",
     "Edit Provider": "プロバイダーを編集",
-    "Email Content": "Email content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Unique string-style identifier",
+    "Email content - Tooltip": "Unique string-style identifier",
-    "Email Title": "メールタイトル",
+    "Email title": "メールタイトル",
-    "Email Title - Tooltip": "Unique string-style identifier",
+    "Email title - Tooltip": "Unique string-style identifier",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "シークレットアクセスキー - ツールチップ",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "署名名",
     "Sign Name - Tooltip": "Unique string-style identifier",
     "Sign request": "サインリクエスト",

web/src/locales/ko/data.json

@@ -514,10 +514,10 @@
     "Domain": "Domain",
     "Domain - Tooltip": "Storage endpoint custom domain",
     "Edit Provider": "Edit Provider",
-    "Email Content": "Email content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Unique string-style identifier",
+    "Email content - Tooltip": "Unique string-style identifier",
-    "Email Title": "Email title",
+    "Email title": "Email title",
-    "Email Title - Tooltip": "Unique string-style identifier",
+    "Email title - Tooltip": "Unique string-style identifier",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Tooltip",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Sign Name",
     "Sign Name - Tooltip": "Unique string-style identifier",
     "Sign request": "Sign request",

web/src/locales/ru/data.json

@@ -514,10 +514,10 @@
     "Domain": "Домен",
     "Domain - Tooltip": "Storage endpoint custom domain",
     "Edit Provider": "Изменить провайдера",
-    "Email Content": "Email content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Unique string-style identifier",
+    "Email content - Tooltip": "Unique string-style identifier",
-    "Email Title": "Заголовок письма",
+    "Email title": "Заголовок письма",
-    "Email Title - Tooltip": "Unique string-style identifier",
+    "Email title - Tooltip": "Unique string-style identifier",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Подсказка",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Имя подписи",
     "Sign Name - Tooltip": "Unique string-style identifier",
     "Sign request": "Запрос на подпись",

web/src/locales/vi/data.json

@@ -514,10 +514,10 @@
     "Domain": "Domain",
     "Domain - Tooltip": "Domain - Tooltip",
     "Edit Provider": "Edit Provider",
-    "Email Content": "Email Content",
+    "Email content": "Email content",
-    "Email Content - Tooltip": "Email Content - Tooltip",
+    "Email content - Tooltip": "Email content - Tooltip",
-    "Email Title": "Email Title",
+    "Email title": "Email title",
-    "Email Title - Tooltip": "Email Title - Tooltip",
+    "Email title - Tooltip": "Email title - Tooltip",
     "Enable QR code": "Enable QR code",
     "Enable QR code - Tooltip": "Enable QR code - Tooltip",
     "Endpoint": "Endpoint",
@@ -563,7 +563,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "Secret key - Tooltip",
     "SecretAccessKey - Tooltip": "SecretAccessKey - Tooltip",
-    "Send Test Email": "Send Test Email",
+    "Send Testing Email": "Send Testing Email",
     "Sign Name": "Sign Name",
     "Sign Name - Tooltip": "Sign Name - Tooltip",
     "Sign request": "Sign request",

web/src/locales/zh/data.json

@@ -27,7 +27,7 @@
     "Copy signup page URL": "复制注册页面URL",
     "Edit Application": "编辑应用",
     "Enable SAML compress": "压缩SAML响应",
-    "Enable SAML compress - Tooltip": "Casdoor作为SAML idp时，是否压缩SAML响应信息",
+    "Enable SAML compress - Tooltip": "Casdoor作为SAML IdP时，是否压缩SAML响应信息",
     "Enable WebAuthn signin": "启用WebAuthn登录",
     "Enable WebAuthn signin - Tooltip": "是否支持用户在登录页面通过WebAuthn方式登录",
     "Enable code signin": "启用验证码登录",
@@ -125,7 +125,7 @@
   },
   "forget": {
     "Account": "账号",
-    "Change Password": "编辑密码",
+    "Change Password": "修改密码",
     "Choose email or phone": "请选择邮箱或手机号验证",
     "Confirm": "验证密码",
     "Next Step": "下一步",
@@ -311,7 +311,6 @@
     "No account?": "没有账号？",
     "Or sign in with another account": "或者，登录其他账号",
     "Password": "密码",
-    "Password - Tooltip": "密码",
     "Please input your Email or Phone!": "请输入您的Email或手机号!",
     "Please input your code!": "请输入您的验证码！",
     "Please input your password!": "请输入您的密码！",
@@ -514,10 +513,10 @@
     "Domain": "域名",
     "Domain - Tooltip": "存储节点自定义域名",
     "Edit Provider": "编辑提供商",
-    "Email Content": "邮件内容",
+    "Email content": "邮件内容",
-    "Email Content - Tooltip": "邮件内容",
+    "Email content - Tooltip": "邮件内容",
-    "Email Title": "邮件标题",
+    "Email title": "邮件标题",
-    "Email Title - Tooltip": "邮件标题",
+    "Email title - Tooltip": "邮件标题",
     "Email sent successfully": "邮件发送成功",
     "Enable QR code": "扫码登陆",
     "Enable QR code - Tooltip": "扫码登陆 - 工具提示",
@@ -551,13 +550,12 @@
     "Region endpoint for Intranet": "地域节点 (内网)",
     "Required": "是否必填项",
     "SAML 2.0 Endpoint (HTTP)": "SAML 2.0 Endpoint (HTTP)",
-    "SMS account": "SMS account",
+    "Send Testing SMS": "发送测试短信",
-    "SMS account - Tooltip": "SMS account - Tooltip",
-    "SMS Send Test": "发送测试短信",
     "SMS Test": "SMS测试",
     "SMS Test - Tooltip": "SMS测试 - 工具提示",
-    "SMS send Failed": "短信发送失败",
+    "SMS account": "SMS account",
-    "SMS send Successfully": "短信发送成功",
+    "SMS account - Tooltip": "SMS account - Tooltip",
+    "SMS sent successfully": "短信发送成功",
     "SP ACS URL": "SP ACS URL",
     "SP ACS URL - Tooltip": "SP ACS URL - 工具提示",
     "SP Entity ID": "SP 实体 ID",
@@ -569,7 +567,7 @@
     "Secret key": "Secret key",
     "Secret key - Tooltip": "用于服务端调用验证码提供商API进行验证",
     "SecretAccessKey - Tooltip": "访问密钥-工具提示",
-    "Send Test Email": "发送测试邮件",
+    "Send Testing Email": "发送测试邮件",
     "Sign Name": "签名名称",
     "Sign Name - Tooltip": "签名名称",
     "Sign request": "签名请求",
@@ -582,7 +580,6 @@
     "Signup HTML - Tooltip": "自定义HTML，用于替换默认的注册页面样式",
     "Site key": "Site key",
     "Site key - Tooltip": "用于前端嵌入页面",
-    "SMTP connected successfully": "SMTP连接成功",
     "Sub type": "子类型",
     "Sub type - Tooltip": "子类型",
     "Template Code": "模板代码",
@@ -656,7 +653,6 @@
     "The input is not valid Email!": "您输入的电子邮箱格式有误！",
     "The input is not valid Phone!": "您输入的手机号格式有误！",
     "Username": "用户名",
-    "Username - Tooltip": "允许字符包括字母、数字、下划线，不得以数字开头",
     "Your account has been created!": "您的账号已创建！",
     "Your confirmed password is inconsistent with the password!": "您两次输入的密码不一致！",
     "sign in now": "立即登录"