diff --git a/controllers/application.go b/controllers/application.go index aeeeb2d7..8922f12a 100644 --- a/controllers/application.go +++ b/controllers/application.go @@ -86,7 +86,7 @@ func (c *ApiController) GetUserApplication() { id := c.Input().Get("id") user := object.GetUser(id) if user == nil { - c.ResponseError(fmt.Sprintf(c.T("application:The user: %s doesn't exist"), id)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), id)) return } diff --git a/controllers/auth.go b/controllers/auth.go index e22f63b1..e88c2202 100644 --- a/controllers/auth.go +++ b/controllers/auth.go @@ -209,7 +209,7 @@ func (c *ApiController) Login() { if form.Username != "" { if form.Type == ResponseTypeLogin { if c.GetSessionUsername() != "" { - c.ResponseError(c.T("auth:Please sign out first before signing in"), c.GetSessionUsername()) + c.ResponseError(c.T("account:Please sign out first before signing in"), c.GetSessionUsername()) return } } @@ -247,7 +247,7 @@ func (c *ApiController) Login() { } user = object.GetUserByFields(form.Organization, form.Username) if user == nil { - c.ResponseError(fmt.Sprintf(c.T("auth:The user: %s/%s doesn't exist"), form.Organization, form.Username)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), form.Organization, form.Username)) return } checkResult = object.CheckSigninCode(user, checkDest, form.Code, c.GetAcceptLanguage()) @@ -422,7 +422,7 @@ func (c *ApiController) Login() { properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2) initScore, err := getInitScore(organization) if err != nil { - c.ResponseError(fmt.Errorf(c.T("auth:Get init score failed, error: %w"), err).Error()) + c.ResponseError(fmt.Errorf(c.T("account:Get init score failed, error: %w"), err).Error()) return } @@ -468,13 +468,13 @@ func (c *ApiController) Login() { record2.User = user.Name util.SafeGoroutine(func() { object.AddRecord(record2) }) } else if provider.Category == "SAML" { - resp = &Response{Status: "error", Msg: "The account does not exist"} + resp = &Response{Status: "error", Msg: c.T("general:The user doesn't exist")} } // resp = &Response{Status: "ok", Msg: "", Data: res} } else { // form.Method != "signup" userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("auth:The account does not exist"), userInfo) + c.ResponseError(c.T("general:The user doesn't exist"), userInfo) return } diff --git a/controllers/enforcer.go b/controllers/enforcer.go index f451ce2b..22809c94 100644 --- a/controllers/enforcer.go +++ b/controllers/enforcer.go @@ -47,7 +47,7 @@ func (c *ApiController) BatchEnforce() { func (c *ApiController) GetAllObjects() { userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("enforcer:Please sign in first")) + c.ResponseError(c.T("general:Please login first")) return } @@ -58,7 +58,7 @@ func (c *ApiController) GetAllObjects() { func (c *ApiController) GetAllActions() { userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("enforcer:Please sign in first")) + c.ResponseError(c.T("general:Please login first")) return } @@ -69,7 +69,7 @@ func (c *ApiController) GetAllActions() { func (c *ApiController) GetAllRoles() { userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("enforcer:Please sign in first")) + c.ResponseError(c.T("general:Please login first")) return } diff --git a/controllers/product.go b/controllers/product.go index fd5fffa4..ebf3f1bf 100644 --- a/controllers/product.go +++ b/controllers/product.go @@ -141,13 +141,13 @@ func (c *ApiController) BuyProduct() { userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("product:Please login first")) + c.ResponseError(c.T("general:Please login first")) return } user := object.GetUser(userId) if user == nil { - c.ResponseError(fmt.Sprintf(c.T("product:The user: %s doesn't exist"), userId)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), userId)) return } diff --git a/controllers/system_info.go b/controllers/system_info.go index 42949c2c..64746a73 100644 --- a/controllers/system_info.go +++ b/controllers/system_info.go @@ -40,7 +40,7 @@ func (c *ApiController) GetSystemInfo() { user := object.GetUser(id) if user == nil || !user.IsGlobalAdmin { - c.ResponseError(c.T("system_info:You are not authorized to access this resource")) + c.ResponseError(c.T("auth:Unauthorized operation")) return } diff --git a/controllers/token.go b/controllers/token.go index b47747aa..265742a0 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -150,7 +150,7 @@ func (c *ApiController) GetOAuthCode() { codeChallenge := c.Input().Get("code_challenge") if challengeMethod != "S256" && challengeMethod != "null" && challengeMethod != "" { - c.ResponseError(c.T("token:Challenge method should be S256")) + c.ResponseError(c.T("auth:Challenge method should be S256")) return } host := c.Ctx.Request.Host diff --git a/controllers/user.go b/controllers/user.go index 06ab67ef..86f532a5 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -363,7 +363,7 @@ func (c *ApiController) GetEmailAndPhone() { user := object.GetUserByFields(form.Organization, form.Username) if user == nil { - c.ResponseError(fmt.Sprintf(c.T("user:The user: %s/%s doesn't exist"), form.Organization, form.Username)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), form.Organization, form.Username)) return } diff --git a/controllers/util.go b/controllers/util.go index ece90de1..504c464f 100644 --- a/controllers/util.go +++ b/controllers/util.go @@ -84,7 +84,7 @@ func (c *ApiController) SetTokenErrorHttpStatus() { func (c *ApiController) RequireSignedIn() (string, bool) { userId := c.GetSessionUsername() if userId == "" { - c.ResponseError(c.T("util:Please login first"), "Please login first") + c.ResponseError(c.T("general:Please login first"), "Please login first") return "", false } return userId, true @@ -100,7 +100,7 @@ func (c *ApiController) RequireSignedInUser() (*object.User, bool) { user := object.GetUser(userId) if user == nil { c.ClearUserSession() - c.ResponseError(fmt.Sprintf(c.T("util:The user: %s doesn't exist"), userId)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), userId)) return nil, false } return user, true diff --git a/controllers/verification.go b/controllers/verification.go index 3a4b7efa..35c0cca0 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -99,7 +99,7 @@ func (c *ApiController) SendVerificationCode() { } if checkUser == "true" && user == nil && object.GetUserByFields(organization.Name, dest) == nil { - c.ResponseError(c.T("verification:Please login first")) + c.ResponseError(c.T("general:Please login first")) return } diff --git a/controllers/webauthn.go b/controllers/webauthn.go index 33778e86..7b24a797 100644 --- a/controllers/webauthn.go +++ b/controllers/webauthn.go @@ -35,7 +35,7 @@ func (c *ApiController) WebAuthnSignupBegin() { webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host) user := c.getCurrentUser() if user == nil { - c.ResponseError(c.T("webauthn:Please login first")) + c.ResponseError(c.T("general:Please login first")) return } @@ -66,7 +66,7 @@ func (c *ApiController) WebAuthnSignupFinish() { webauthnObj := object.GetWebAuthnObject(c.Ctx.Request.Host) user := c.getCurrentUser() if user == nil { - c.ResponseError(c.T("webauthn:Please login first")) + c.ResponseError(c.T("general:Please login first")) return } sessionObj := c.GetSession("registration") @@ -101,7 +101,7 @@ func (c *ApiController) WebAuthnSigninBegin() { userName := c.Input().Get("name") user := object.GetUserByFields(userOwner, userName) if user == nil { - c.ResponseError(fmt.Sprintf(c.T("webauthn:The user: %s/%s doesn't exist"), userOwner, userName)) + c.ResponseError(fmt.Sprintf(c.T("general:The user: %s/%s doesn't exist"), userOwner, userName)) return } if len(user.WebauthnCredentials) == 0 { diff --git a/i18n/locales/de/data.json b/i18n/locales/de/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/de/data.json +++ b/i18n/locales/de/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/en/data.json b/i18n/locales/en/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/en/data.json +++ b/i18n/locales/en/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/es/data.json b/i18n/locales/es/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/es/data.json +++ b/i18n/locales/es/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/fr/data.json b/i18n/locales/fr/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/fr/data.json +++ b/i18n/locales/fr/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/ja/data.json b/i18n/locales/ja/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/ja/data.json +++ b/i18n/locales/ja/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/ko/data.json b/i18n/locales/ko/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/ko/data.json +++ b/i18n/locales/ko/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/ru/data.json b/i18n/locales/ru/data.json index 2560589c..ca333842 100644 --- a/i18n/locales/ru/data.json +++ b/i18n/locales/ru/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid information": "Invalid information", "Phone: %s": "Phone: %s", + "Please sign out first before signing in": "Please sign out first before signing in", "Please sign out first before signing up": "Please sign out first before signing up", "The application does not allow to sign up new account": "The application does not allow to sign up new account" }, "application": { - "Parameter organization is missing": "Parameter organization is missing", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "Parameter organization is missing": "Parameter organization is missing" }, "auth": { "%s No phone prefix": "%s No phone prefix", "Challenge method should be S256": "Challenge method should be S256", "Failed to create user, user information is invalid: %s": "Failed to create user, user information is invalid: %s", "Failed to login in: %s": "Failed to login in: %s", - "Get init score failed, error: %w": "Get init score failed, error: %w", "Invalid token": "Invalid token", - "Please sign out first before signing in": "Please sign out first before signing in", "State expected: %s, but got: %s": "State expected: %s, but got: %s", - "The account does not exist": "The account does not exist", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "The provider type: %s is not supported", "The provider: %s is not enabled for the application": "The provider: %s is not enabled for the application", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist", "Turing test failed.": "Turing test failed.", "Unauthorized operation": "Unauthorized operation", "Unknown authentication type (not password or provider), form = %s": "Unknown authentication type (not password or provider), form = %s" @@ -54,11 +50,8 @@ "Phone already exists": "Phone already exists", "Phone cannot be empty": "Phone cannot be empty", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Session outdated, please login again": "Session outdated, please login again", - "The user doesn't exist": "The user doesn't exist", "The user is forbidden to sign in, please contact the administrator": "The user is forbidden to sign in, please contact the administrator", - "The user: %s doesn't exist": "The user: %s doesn't exist", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.", "Username already exists": "Username already exists", "Username cannot be an email address": "Username cannot be an email address", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "Username cannot start with a digit", "Username is too long (maximum is 39 characters).": "Username is too long (maximum is 39 characters).", "Username must have at least 2 characters": "Username must have at least 2 characters", - "You don't have the permission to do this": "You don't have the permission to do this", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "You have entered the wrong password or code too many times, please wait for %d minutes and try again", "password or code is incorrect, you have %d remaining chances": "password or code is incorrect, you have %d remaining chances", "unsupported password type: %s": "unsupported password type: %s" }, - "enforcer": { - "Please sign in first": "Please sign in first" + "general": { + "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/%s doesn't exist": "The user: %s/%s doesn't exist" }, "ldap": { "Ldap server exist": "Ldap server exist", @@ -91,10 +86,6 @@ "The %s is immutable.": "The %s is immutable.", "Unknown modify rule %s.": "Unknown modify rule %s." }, - "product": { - "Please login first": "Please login first", - "The user: %s doesn't exist": "The user: %s doesn't exist" - }, "provider": { "Invalid application id": "Invalid application id", "the provider: %s does not exist": "the provider: %s does not exist" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "The objectKey: %s is not allowed", "The provider type: %s is not supported": "The provider type: %s is not supported" }, - "system_info": { - "You are not authorized to access this resource": "You are not authorized to access this resource" - }, "token": { - "Challenge method should be S256": "Challenge method should be S256", "Empty clientId or clientSecret": "Empty clientId or clientSecret", "Grant_type: %s is not supported in this application": "Grant_type: %s is not supported in this application", "Invalid application or wrong clientSecret": "Invalid application or wrong clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "Display name cannot be empty", "New password cannot contain blank space.": "New password cannot contain blank space.", - "New password must have at least 6 characters": "New password must have at least 6 characters", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "New password must have at least 6 characters": "New password must have at least 6 characters" }, "user_upload": { "Failed to import users": "Failed to import users" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "No application is found for userId: %s", "No provider for category: %s is found for application: %s": "No provider for category: %s is found for application: %s", - "Please login first": "Please login first", - "The provider: %s is not found": "The provider: %s is not found", - "The user: %s doesn't exist": "The user: %s doesn't exist" + "The provider: %s is not found": "The provider: %s is not found" }, "verification": { "Code has not been sent yet!": "Code has not been sent yet!", @@ -152,7 +136,6 @@ "Missing parameter": "Missing parameter", "Organization does not exist": "Organization does not exist", "Phone number is invalid": "Phone number is invalid", - "Please login first": "Please login first", "Turing test failed.": "Turing test failed.", "Unable to get the email modify rule.": "Unable to get the email modify rule.", "Unable to get the phone modify rule.": "Unable to get the phone modify rule.", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "Found no credentials for this user", - "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first", - "Please login first": "Please login first", - "The user: %s/%s doesn't exist": "The user: %s/%s doesn't exist" + "Please call WebAuthnSigninBegin first": "Please call WebAuthnSigninBegin first" } } diff --git a/i18n/locales/zh/data.json b/i18n/locales/zh/data.json index 4b3efd3f..b840a275 100644 --- a/i18n/locales/zh/data.json +++ b/i18n/locales/zh/data.json @@ -4,23 +4,20 @@ "Get init score failed, error: %w": "初始化分数失败: %w", "Invalid information": "无效信息", "Phone: %s": "手机号: %s", - "Please sign out first before signing up": "请在登录前登出", + "Please sign out first before signing in": "请在登录前登出", + "Please sign out first before signing up": "请在注册前登出", "The application does not allow to sign up new account": "该应用不允许注册新账户" }, "application": { - "Parameter organization is missing": "organization参数丢失", - "The user: %s doesn't exist": "用户不存在: %s" + "Parameter organization is missing": "organization参数丢失" }, "auth": { "%s No phone prefix": "%s 无此手机号前缀", "Challenge method should be S256": "Challenge 方法应该为 S256", "Failed to create user, user information is invalid: %s": "创建用户失败,用户信息无效: %s", "Failed to login in: %s": "无法登录: %s", - "Get init score failed, error: %w": "初始化分数失败: %w", "Invalid token": "无效token", - "Please sign out first before signing in": "请在登录前登出", "State expected: %s, but got: %s": "期望状态为: %s, 实际状态为: %s", - "The account does not exist": "账户不存在", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account via %%s, please use another way to sign up": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许通过 %s 注册新账户, 请使用其他方式注册", "The account for provider: %s and username: %s (%s) does not exist and is not allowed to sign up as new account, please contact your IT support": "提供商账户: %s 与用户名: %s (%s) 不存在且 不允许注册新账户, 请联系IT支持", "The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)": "提供商账户: %s 与用户名: %s (%s) 已经与其他账户绑定: %s (%s)", @@ -29,7 +26,6 @@ "The provider type: %s is not supported": "不支持该类型的提供商: %s", "The provider: %s is not enabled for the application": "提供商: %s 未被启用", "The user is forbidden to sign in, please contact the administrator": "该用户被禁止登录,请联系管理员", - "The user: %s/%s doesn't exist": "用户不存在: %s/%s", "Turing test failed.": "人机验证失败", "Unauthorized operation": "未授权的操作", "Unknown authentication type (not password or provider), form = %s": "未知的认证类型(非密码或第三方提供商):%s" @@ -54,11 +50,8 @@ "Phone already exists": "该手机号已存在", "Phone cannot be empty": "手机号不可为空", "Phone number is invalid": "无效手机号", - "Please login first": "请先登录", "Session outdated, please login again": "会话已过期,请重新登录", - "The user doesn't exist": "用户不存在", "The user is forbidden to sign in, please contact the administrator": "该用户被禁止登录,请联系管理员", - "The user: %s doesn't exist": "用户不存在: %s", "The username may only contain alphanumeric characters, underlines or hyphens, cannot have consecutive hyphens or underlines, and cannot begin or end with a hyphen or underline.": "用户名只能包含字母数字字符、下划线或连字符,不能有连续的连字符或下划线,也不能以连字符或下划线开头或结尾", "Username already exists": "用户名已存在", "Username cannot be an email address": "用户名不可以是邮箱地址", @@ -66,13 +59,15 @@ "Username cannot start with a digit": "用户名禁止使用数字开头", "Username is too long (maximum is 39 characters).": "用户名过长(最大允许长度为39个字符)", "Username must have at least 2 characters": "用户名至少要有2个字符", - "You don't have the permission to do this": "无权进行该操作", "You have entered the wrong password or code too many times, please wait for %d minutes and try again": "密码错误次数已达上限,请在 %d 分后重试", "password or code is incorrect, you have %d remaining chances": "密码错误,您还有 %d 次尝试的机会", "unsupported password type: %s": "不支持的密码类型: %s" }, - "enforcer": { - "Please sign in first": "请先登录" + "general": { + "Please login first": "请先登录", + "The user doesn't exist": "用户不存在", + "The user: %s doesn't exist": "用户: %s 不存在", + "The user: %s/%s doesn't exist": "用户: %s/%s 不存在" }, "ldap": { "Ldap server exist": "LDAP服务器已存在", @@ -91,10 +86,6 @@ "The %s is immutable.": "%s是不可变的", "Unknown modify rule %s.": "未知的修改规则" }, - "product": { - "Please login first": "请先登录", - "The user: %s doesn't exist": "用户不存在: %s" - }, "provider": { "Invalid application id": "无效的应用ID", "the provider: %s does not exist": "提供商: %s 不存在" @@ -118,11 +109,7 @@ "The objectKey: %s is not allowed": "objectKey :%s 不被允许", "The provider type: %s is not supported": "提供商类型: %s 尚未支持" }, - "system_info": { - "You are not authorized to access this resource": "您无权获取此资源" - }, "token": { - "Challenge method should be S256": "Challenge 方法应该为 S256", "Empty clientId or clientSecret": "clientId或clientSecret为空", "Grant_type: %s is not supported in this application": "此应用中不支持此授权类型: %s", "Invalid application or wrong clientSecret": "无效应用或错误的clientSecret", @@ -132,8 +119,7 @@ "user": { "Display name cannot be empty": "显示名称不可为空", "New password cannot contain blank space.": "新密码不可以包含空格", - "New password must have at least 6 characters": "新密码至少需要6位字符", - "The user: %s/%s doesn't exist": "用户不存在: %s/%s" + "New password must have at least 6 characters": "新密码至少需要6位字符" }, "user_upload": { "Failed to import users": "导入用户失败" @@ -141,9 +127,7 @@ "util": { "No application is found for userId: %s": "找不到该用户的应用程序 %s", "No provider for category: %s is found for application: %s": "找不到该用户的应用程序 %s", - "Please login first": "请先登录", - "The provider: %s is not found": "未找到提供商: %s", - "The user: %s doesn't exist": "用户不存在: %s" + "The provider: %s is not found": "未找到提供商: %s" }, "verification": { "Code has not been sent yet!": "验证码还未发送", @@ -152,7 +136,6 @@ "Missing parameter": "参数丢失", "Organization does not exist": "组织不存在", "Phone number is invalid": "非法的手机号码", - "Please login first": "请先登录", "Turing test failed.": "验证码还未发送", "Unable to get the email modify rule.": "无法得到邮箱修改规则", "Unable to get the phone modify rule.": "无法得到手机号修改规则", @@ -163,8 +146,6 @@ }, "webauthn": { "Found no credentials for this user": "该用户没有WebAuthn凭据", - "Please call WebAuthnSigninBegin first": "请先调用 WebAuthnSigninBegin", - "Please login first": "请先登录", - "The user: %s/%s doesn't exist": "用户: %s/%s 不存在" + "Please call WebAuthnSigninBegin first": "请先调用 WebAuthnSigninBegin" } } diff --git a/object/check.go b/object/check.go index c2775276..f6cd1987 100644 --- a/object/check.go +++ b/object/check.go @@ -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) { user := GetUserByFields(organization, username) if user == nil || user.IsDeleted == true { - return nil, i18n.Translate(lang, "check:The user doesn't exist") + return nil, i18n.Translate(lang, "general:The user doesn't exist") } if user.IsForbidden { @@ -254,13 +254,13 @@ func filterField(field string) bool { func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, lang string) (bool, error) { if requestUserId == "" { - return false, fmt.Errorf(i18n.Translate(lang, "check:Please login first")) + return false, fmt.Errorf(i18n.Translate(lang, "general:Please login first")) } if userId != "" { targetUser := GetUser(userId) if targetUser == nil { - return false, fmt.Errorf(i18n.Translate(lang, "check:The user: %s doesn't exist"), userId) + return false, fmt.Errorf(i18n.Translate(lang, "general:The user: %s doesn't exist"), userId) } userOwner = targetUser.Owner @@ -287,7 +287,7 @@ func CheckUserPermission(requestUserId, userId, userOwner string, strict bool, l } } - return hasPermission, fmt.Errorf(i18n.Translate(lang, "check:You don't have the permission to do this")) + return hasPermission, fmt.Errorf(i18n.Translate(lang, "auth:Unauthorized operation")) } func CheckAccessPermission(userId string, application *Application) (bool, error) { diff --git a/object/token.go b/object/token.go index 53b90fc6..dc8c3e93 100644 --- a/object/token.go +++ b/object/token.go @@ -265,7 +265,7 @@ func GetOAuthCode(userId string, clientId string, responseType string, redirectU user := GetUser(userId) if user == nil { return &Code{ - Message: fmt.Sprintf("token:The user: %s doesn't exist", userId), + Message: fmt.Sprintf("general:The user: %s doesn't exist", userId), Code: "", } }