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

Remove duplicated i18n words

Browse Source
This commit is contained in:
Gucheng Wang
2023-01-06 20:24:14 +08:00
parent a6e9084973
commit 57028c2059
12 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/auth.go
View File

@ -247,7 +247,7 @@ func (c *ApiController) Login() {
} }
user = object.GetUserByFields(form.Organization, form.Username) user = object.GetUserByFields(form.Organization, form.Username)
if user == nil { if user == nil {
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), form.Organization, form.Username)) c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(form.Organization, form.Username)))
return return
} }
checkResult = object.CheckSigninCode(user, checkDest, form.Code, c.GetAcceptLanguage()) checkResult = object.CheckSigninCode(user, checkDest, form.Code, c.GetAcceptLanguage())
@ -468,13 +468,13 @@ func (c *ApiController) Login() {
record2.User = user.Name record2.User = user.Name
util.SafeGoroutine(func() { object.AddRecord(record2) }) util.SafeGoroutine(func() { object.AddRecord(record2) })
} else if provider.Category == "SAML" { } else if provider.Category == "SAML" {
resp = &Response{Status: "error", Msg: c.T("general:The user doesn't exist")} resp = &Response{Status: "error", Msg: fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(application.Organization, userInfo.Id))}
} }
// resp = &Response{Status: "ok", Msg: "", Data: res} // resp = &Response{Status: "ok", Msg: "", Data: res}
} else { // form.Method != "signup" } else { // form.Method != "signup"
userId := c.GetSessionUsername() userId := c.GetSessionUsername()
if userId == "" { if userId == "" {
c.ResponseError(c.T("general:The user doesn't exist"), userInfo) c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(application.Organization, userInfo.Id)), userInfo)
return return
} }

2
controllers/user.go
View File

@ -363,7 +363,7 @@ func (c *ApiController) GetEmailAndPhone() {
user := object.GetUserByFields(form.Organization, form.Username) user := object.GetUserByFields(form.Organization, form.Username)
if user == nil { if user == nil {
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), form.Organization, form.Username)) c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(form.Organization, form.Username)))
return return
} }

2
controllers/webauthn.go
View File

@ -101,7 +101,7 @@ func (c *ApiController) WebAuthnSigninBegin() {
userName := c.Input().Get("name") userName := c.Input().Get("name")
user := object.GetUserByFields(userOwner, userName) user := object.GetUserByFields(userOwner, userName)
if user == nil { if user == nil {
c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), userOwner, userName)) c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(userOwner, userName)))
return return
} }
if len(user.WebauthnCredentials) == 0 { if len(user.WebauthnCredentials) == 0 {

4
i18n/locales/de/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/en/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/es/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/fr/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/ja/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/ko/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

4
i18n/locales/ru/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "Please login first", "Please login first": "Please login first",
"The user doesn't exist": "The user doesn't exist", "The user: %s doesn't exist": "The user: %s doesn't exist"
"The user: %s doesn't exist": "The user: %s doesn't exist",
"The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist"
}, },
"ldap": { "ldap": {
"Ldap server exist": "Ldap server exist", "Ldap server exist": "Ldap server exist",

8
i18n/locales/zh/data.json
View File

@ -65,9 +65,7 @@
}, },
"general": { "general": {
"Please login first": "请先登录", "Please login first": "请先登录",
"The user doesn't exist": "用户不存在", "The user: %s doesn't exist": "用户: %s 不存在"
"The user: %s doesn't exist": "用户: %s 不存在",
"The user: %s/%s doesn't exist": "用户: %s/%s 不存在"
}, },
"ldap": { "ldap": {
"Ldap server exist": "LDAP服务器已存在", "Ldap server exist": "LDAP服务器已存在",
@ -125,8 +123,8 @@
"Failed to import users": "导入用户失败" "Failed to import users": "导入用户失败"
}, },
"util": { "util": {
"No application is found for userId: %s": "找不到该用户的应用程序 %s", "No application is found for userId: %s": "未找到用户: %s 的应用",
"No provider for category: %s is found for application: %s": "找不到该用户的应用程序 %s", "No provider for category: %s is found for application: %s": "未找到类别为: %s 的提供商来满足应用: %s",
"The provider: %s is not found": "未找到提供商: %s" "The provider: %s is not found": "未找到提供商: %s"
}, },
"verification": { "verification": {

2
object/check.go
View File

@ -229,7 +229,7 @@ func checkLdapUserPassword(user *User, password string, lang string) (*User, str
func CheckUserPassword(organization string, username string, password string, lang string) (*User, string) { func CheckUserPassword(organization string, username string, password string, lang string) (*User, string) {
user := GetUserByFields(organization, username) user := GetUserByFields(organization, username)
if user == nil || user.IsDeleted == true { if user == nil || user.IsDeleted == true {
return nil, i18n.Translate(lang, "general:The user doesn't exist") return nil, fmt.Sprintf(i18n.Translate(lang, "general:The user: %s doesn't exist"), util.GetId(organization, username))
} }
if user.IsForbidden { if user.IsForbidden {