llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-04 05:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve i18n.

Browse Source
This commit is contained in:
Yang Luo
2021-06-15 22:12:50 +08:00
parent 7871541cd5
commit 8bc9163def
7 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/ResetModal.js
View File

@ -85,7 +85,7 @@ export const ResetModal = (props) => {
</Row> </Row>
<Row style={{width: "100%", marginBottom: "20px"}}> <Row style={{width: "100%", marginBottom: "20px"}}>
<CountDownInput <CountDownInput
defaultButtonText={i18next.t("user:Send Code")} defaultButtonText={i18next.t("user:Send code")}
textBefore={i18next.t("user:Code You Received")} textBefore={i18next.t("user:Code You Received")}
placeHolder={i18next.t("user:Enter your code")} placeHolder={i18next.t("user:Enter your code")}
onChange={setCode} onChange={setCode}

4
web/src/auth/ForgetPage.js
View File

@ -320,7 +320,7 @@ class ForgetPage extends React.Component {
<CountDownInput <CountDownInput
disabled={this.state.username === "" || this.state.verifyType === ""} disabled={this.state.username === "" || this.state.verifyType === ""}
placeHolder={i18next.t("forget:Verify code")} placeHolder={i18next.t("forget:Verify code")}
defaultButtonText={i18next.t("forget:send code")} defaultButtonText={i18next.t("user:Send code")}
onButtonClick={UserBackend.sendCode} onButtonClick={UserBackend.sendCode}
onButtonClickArgs={[ onButtonClickArgs={[
this.state.email, this.state.email,
@ -335,7 +335,7 @@ class ForgetPage extends React.Component {
<CountDownInput <CountDownInput
disabled={this.state.username === "" || this.state.verifyType === ""} disabled={this.state.username === "" || this.state.verifyType === ""}
placeHolder={i18next.t("forget:Verify code")} placeHolder={i18next.t("forget:Verify code")}
defaultButtonText={i18next.t("forget:send code")} defaultButtonText={i18next.t("User:Send code")}
onButtonClick={UserBackend.sendCode} onButtonClick={UserBackend.sendCode}
onButtonClickArgs={[ onButtonClickArgs={[
this.state.phone, this.state.phone,

2
web/src/auth/LoginPage.js
View File

@ -335,7 +335,7 @@ class LoginPage extends React.Component {
return ( return (
<Row> <Row>
<Col span={24} style={{display: "flex", justifyContent: "center"}}> <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) Setting.renderHelmet(application)
} }

2
web/src/auth/Provider.js
View File

@ -43,7 +43,7 @@ const WeiboAuthScope = "email";
const WeiboAuthUri = "https://api.weibo.com/oauth2/authorize"; const WeiboAuthUri = "https://api.weibo.com/oauth2/authorize";
const WeiboAuthLogo = `${StaticBaseUrl}/img/social_weibo.png`; 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 GiteeAuthUri = "https://gitee.com/oauth/authorize";
const GiteeAuthLogo = `${StaticBaseUrl}/img/social_gitee.png`; const GiteeAuthLogo = `${StaticBaseUrl}/img/social_gitee.png`;

8
web/src/auth/SignupPage.js
View File

@ -240,14 +240,14 @@ class SignupPage extends React.Component {
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="emailCode" name="emailCode"
label={i18next.t("signup:email code")} label={i18next.t("signup:Email code")}
rules={[{ rules={[{
required: true, required: true,
message: i18next.t("signup:Please input your verification code!"), message: i18next.t("signup:Please input your verification code!"),
}]} }]}
> >
<CountDownInput <CountDownInput
defaultButtonText={i18next.t("signup:send code")} defaultButtonText={i18next.t("user:Send code")}
onButtonClick={UserBackend.sendCode} onButtonClick={UserBackend.sendCode}
onButtonClickArgs={[this.state.email, "email", application?.organizationObj.owner + "/" + application?.organizationObj.name]} onButtonClickArgs={[this.state.email, "email", application?.organizationObj.owner + "/" + application?.organizationObj.name]}
coolDownTime={60} coolDownTime={60}
@ -309,7 +309,7 @@ class SignupPage extends React.Component {
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name="phoneCode" name="phoneCode"
label={i18next.t("signup:phone code")} label={i18next.t("signup:Phone code")}
rules={[ rules={[
{ {
required: true, required: true,
@ -318,7 +318,7 @@ class SignupPage extends React.Component {
]} ]}
> >
<CountDownInput <CountDownInput
defaultButtonText={i18next.t("signup:send code")} defaultButtonText={i18next.t("user:Send code")}
onButtonClick={UserBackend.sendCode} onButtonClick={UserBackend.sendCode}
onButtonClickArgs={[this.state.phone, "phone", application.organizationObj.owner + "/" + application.organizationObj.name]} onButtonClickArgs={[this.state.phone, "phone", application.organizationObj.owner + "/" + application.organizationObj.name]}
coolDownTime={60} coolDownTime={60}

8
web/src/locales/en.json
View File

@ -54,9 +54,8 @@
"Your account has been created!": "Your account has been created!", "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", "Please click the below button to sign in": "Please click the below button to sign in",
"code sent": "code sent", "code sent": "code sent",
"send code": "send code", "Email code": "Email code",
"email code": "email code", "Phone code": "Phone code",
"phone code": "phone code",
"PhoneCode has not been sent yet!": "Phone code has not been sent yet!", "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!", "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!", "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", "input password": "input password",
"Reset Email...": "Reset Email...", "Reset Email...": "Reset Email...",
"Reset Phone...": "Reset Phone...", "Reset Phone...": "Reset Phone...",
"Send Code": "Send Code", "Send code": "Send code",
"Empty email": "Empty Email", "Empty email": "Empty Email",
"Empty phone": "Empty Phone", "Empty phone": "Empty Phone",
"Empty Code": "Empty Code", "Empty Code": "Empty Code",
@ -191,7 +190,6 @@
"Please input your Email/Phone string!": "Please input your Email/Phone string!", "Please input your Email/Phone string!": "Please input your Email/Phone string!",
"Please input your verification code!": "Please input your verification code!", "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!", "Your confirmed password is inconsistent with the password!": "Your confirmed password is inconsistent with the password!",
"send code": "send code",
"Account": "Account", "Account": "Account",
"Verify": "Verify", "Verify": "Verify",
"Retrieve password": "Retrieve password", "Retrieve password": "Retrieve password",

8
web/src/locales/zh.json
View File

@ -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": "发送验证码", "Email code": "邮箱验证码",
"email code": "邮箱验证码", "Phone code": "手机验证码",
"phone code": "手机验证码",
"PhoneCode has not been sent yet!": "尚未发送验证码至手机", "PhoneCode has not been sent yet!": "尚未发送验证码至手机",
"EmailCode has not been sent yet!": "尚未发送验证码至邮箱", "EmailCode has not been sent yet!": "尚未发送验证码至邮箱",
"PhoneYou should verify your code in 10 min!": "你应该在 10 分钟之内验证手机号", "PhoneYou should verify your code in 10 min!": "你应该在 10 分钟之内验证手机号",
@ -148,7 +147,7 @@
"input password": "输入密码", "input password": "输入密码",
"Reset Email...": "重置邮箱...", "Reset Email...": "重置邮箱...",
"Reset Phone...": "重置手机号...", "Reset Phone...": "重置手机号...",
"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": "发送验证码",
"Verify code": "验证码", "Verify code": "验证码",
"Password": "密码", "Password": "密码",
"Next Step": "下一步", "Next Step": "下一步",