diff --git a/object/application.go b/object/application.go index abff4bee..ec8e8cf6 100644 --- a/object/application.go +++ b/object/application.go @@ -42,7 +42,7 @@ type SignupItem struct { type SamlItem struct { Name string `json:"name"` - NameFormat string `json:"nameformat"` + NameFormat string `json:"nameFormat"` Value string `json:"value"` } @@ -347,6 +347,17 @@ func GetMaskedApplication(application *Application, userId string) *Application return nil } + if application.TokenFields == nil { + application.TokenFields = []string{} + } + + if application.FailedSigninLimit == 0 { + application.FailedSigninLimit = DefaultFailedSigninLimit + } + if application.FailedSigninFrozenTime == 0 { + application.FailedSigninFrozenTime = DefaultFailedSigninFrozenTime + } + if userId != "" { if isUserIdGlobalAdmin(userId) { return application @@ -384,13 +395,6 @@ func GetMaskedApplication(application *Application, userId string) *Application application.InvitationCodes = []string{"***"} } - if application.FailedSigninLimit == 0 { - application.FailedSigninLimit = DefaultFailedSigninLimit - } - if application.FailedSigninFrozenTime == 0 { - application.FailedSigninFrozenTime = DefaultFailedSigninFrozenTime - } - return application } diff --git a/swagger/swagger.json b/swagger/swagger.json index 44faf4cf..f6441261 100644 --- a/swagger/swagger.json +++ b/swagger/swagger.json @@ -6761,7 +6761,7 @@ "name": { "type": "string" }, - "nameformat": { + "nameFormat": { "type": "string" }, "value": { diff --git a/swagger/swagger.yml b/swagger/swagger.yml index c240d39c..1e3a7923 100644 --- a/swagger/swagger.yml +++ b/swagger/swagger.yml @@ -4451,7 +4451,7 @@ definitions: properties: name: type: string - nameformat: + nameFormat: type: string value: type: string diff --git a/web/src/locales/ar/data.json b/web/src/locales/ar/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/ar/data.json +++ b/web/src/locales/ar/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json index 7d0ef69c..362d6fa5 100644 --- a/web/src/locales/de/data.json +++ b/web/src/locales/de/data.json @@ -267,6 +267,7 @@ "Models": "Modelle", "Name": "Name", "Name - Tooltip": "Eindeutige, auf Strings basierende ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth-Provider", @@ -1053,8 +1054,6 @@ "Managed accounts": "Verwaltete Konten", "Modify password...": "Passwort ändern...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "Neue E-Mail", "New Password": "Neues Passwort", "New User": "Neuer Benutzer", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Lade ein Foto hoch", - "Value": "Value", "Values": "Werte", "Verification code sent": "Bestätigungscode gesendet", "WebAuthn credentials": "WebAuthn-Anmeldeinformationen", diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json index 882295f4..cef5a130 100644 --- a/web/src/locales/en/data.json +++ b/web/src/locales/en/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/es/data.json b/web/src/locales/es/data.json index 30c41cf1..60d92f21 100644 --- a/web/src/locales/es/data.json +++ b/web/src/locales/es/data.json @@ -267,6 +267,7 @@ "Models": "Modelos", "Name": "Nombre", "Name - Tooltip": "ID único basado en cadenas", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "Proveedores de OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Cuentas gestionadas", "Modify password...": "Modificar contraseña...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "Nuevo correo electrónico", "New Password": "Nueva contraseña", "New User": "Nuevo Usuario", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Subir una foto", - "Value": "Value", "Values": "Valores", "Verification code sent": "Código de verificación enviado", "WebAuthn credentials": "Credenciales de WebAuthn", diff --git a/web/src/locales/fa/data.json b/web/src/locales/fa/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/fa/data.json +++ b/web/src/locales/fa/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/fi/data.json b/web/src/locales/fi/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/fi/data.json +++ b/web/src/locales/fi/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json index 08e69754..c0ab126c 100644 --- a/web/src/locales/fr/data.json +++ b/web/src/locales/fr/data.json @@ -267,6 +267,7 @@ "Models": "Modèles", "Name": "Nom", "Name - Tooltip": "Identifiant unique à base de chaîne", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "Aucun", "OAuth providers": "Fournisseurs OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Comptes gérés", "Modify password...": "Modifier le mot de passe...", "Multi-factor authentication": "Authentification multifacteur", - "Name": "Name", - "Name format": "Name format", "New Email": "Nouvelle adresse e-mail", "New Password": "Nouveau mot de passe", "New User": "Nouveau compte", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Télécharger une photo de l'endroit de la pièce d'identité", "Upload ID card with person picture": "Télécharger une photo la pièce d'identité avec une personne", "Upload a photo": "Télécharger une photo", - "Value": "Value", "Values": "Valeurs", "Verification code sent": "Code de vérification envoyé", "WebAuthn credentials": "Identifiants WebAuthn", diff --git a/web/src/locales/he/data.json b/web/src/locales/he/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/he/data.json +++ b/web/src/locales/he/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/id/data.json b/web/src/locales/id/data.json index 42a31582..2cf50781 100644 --- a/web/src/locales/id/data.json +++ b/web/src/locales/id/data.json @@ -267,6 +267,7 @@ "Models": "Model-model", "Name": "Nama", "Name - Tooltip": "ID unik berbasis string", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "Penyedia OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Akun yang dikelola", "Modify password...": "Mengubah kata sandi...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "Email baru", "New Password": "Kata Sandi Baru", "New User": "Pengguna Baru", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Unggah foto", - "Value": "Value", "Values": "Nilai-nilai", "Verification code sent": "Kode verifikasi telah dikirim", "WebAuthn credentials": "Kredensial WebAuthn", diff --git a/web/src/locales/it/data.json b/web/src/locales/it/data.json index d84a521b..f57b7198 100644 --- a/web/src/locales/it/data.json +++ b/web/src/locales/it/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json index e3069590..15777b98 100644 --- a/web/src/locales/ja/data.json +++ b/web/src/locales/ja/data.json @@ -267,6 +267,7 @@ "Models": "モデル", "Name": "名前", "Name - Tooltip": "ユニークで文字列ベースのID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuthプロバイダー", @@ -1053,8 +1054,6 @@ "Managed accounts": "管理アカウント", "Modify password...": "パスワードを変更する...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "新しいメール", "New Password": "新しいパスワード", "New User": "新しいユーザー", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "写真をアップロードしてください", - "Value": "Value", "Values": "価値観", "Verification code sent": "確認コードを送信しました", "WebAuthn credentials": "WebAuthnの資格情報", diff --git a/web/src/locales/kk/data.json b/web/src/locales/kk/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/kk/data.json +++ b/web/src/locales/kk/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json index d4420ef3..14b5d26b 100644 --- a/web/src/locales/ko/data.json +++ b/web/src/locales/ko/data.json @@ -267,6 +267,7 @@ "Models": "모델들", "Name": "이름", "Name - Tooltip": "고유한 문자열 기반 ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth 공급자", @@ -1053,8 +1054,6 @@ "Managed accounts": "관리 계정", "Modify password...": "비밀번호 수정하기...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "새 이메일", "New Password": "새로운 비밀번호", "New User": "새로운 사용자", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "사진을 업로드하세요", - "Value": "Value", "Values": "가치들", "Verification code sent": "인증 코드가 전송되었습니다", "WebAuthn credentials": "웹 인증 자격증명", diff --git a/web/src/locales/ms/data.json b/web/src/locales/ms/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/ms/data.json +++ b/web/src/locales/ms/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/nl/data.json b/web/src/locales/nl/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/nl/data.json +++ b/web/src/locales/nl/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/pl/data.json b/web/src/locales/pl/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/pl/data.json +++ b/web/src/locales/pl/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/pt/data.json b/web/src/locales/pt/data.json index c8e35f5a..c19dc9e9 100644 --- a/web/src/locales/pt/data.json +++ b/web/src/locales/pt/data.json @@ -267,6 +267,7 @@ "Models": "Modelos", "Name": "Nome", "Name - Tooltip": "ID único em formato de string", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "Provedores OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Contas gerenciadas", "Modify password...": "Modificar senha...", "Multi-factor authentication": "Autenticação de vários fatores", - "Name": "Name", - "Name format": "Name format", "New Email": "Novo E-mail", "New Password": "Nova Senha", "New User": "Novo Usuário", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Enviar uma foto", - "Value": "Value", "Values": "Valores", "Verification code sent": "Código de verificação enviado", "WebAuthn credentials": "Credenciais WebAuthn", diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json index 1480e060..b9b79e91 100644 --- a/web/src/locales/ru/data.json +++ b/web/src/locales/ru/data.json @@ -267,6 +267,7 @@ "Models": "Модели", "Name": "Имя", "Name - Tooltip": "Уникальный идентификатор на основе строки", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "Провайдеры OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Управляемые счета", "Modify password...": "Изменить пароль...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "Новое электронное письмо", "New Password": "Новый пароль", "New User": "Новый пользователь", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Загрузить фото", - "Value": "Value", "Values": "Значения", "Verification code sent": "Код подтверждения отправлен", "WebAuthn credentials": "WebAuthn удостоверения", diff --git a/web/src/locales/sv/data.json b/web/src/locales/sv/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/sv/data.json +++ b/web/src/locales/sv/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/tr/data.json b/web/src/locales/tr/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/tr/data.json +++ b/web/src/locales/tr/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/uk/data.json b/web/src/locales/uk/data.json index 11e2fa0e..271f8373 100644 --- a/web/src/locales/uk/data.json +++ b/web/src/locales/uk/data.json @@ -267,6 +267,7 @@ "Models": "Models", "Name": "Name", "Name - Tooltip": "Unique, string-based ID", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "OAuth providers", @@ -1053,8 +1054,6 @@ "Managed accounts": "Managed accounts", "Modify password...": "Modify password...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "New Email", "New Password": "New Password", "New User": "New User", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Upload a photo", - "Value": "Value", "Values": "Values", "Verification code sent": "Verification code sent", "WebAuthn credentials": "WebAuthn credentials", diff --git a/web/src/locales/vi/data.json b/web/src/locales/vi/data.json index 1cdee542..db9233e9 100644 --- a/web/src/locales/vi/data.json +++ b/web/src/locales/vi/data.json @@ -267,6 +267,7 @@ "Models": "Mô hình", "Name": "Tên", "Name - Tooltip": "ID duy nhất dựa trên chuỗi", + "Name format": "Name format", "Non-LDAP": "Non-LDAP", "None": "None", "OAuth providers": "Nhà cung cấp OAuth", @@ -1053,8 +1054,6 @@ "Managed accounts": "Quản lý tài khoản", "Modify password...": "Sửa đổi mật khẩu...", "Multi-factor authentication": "Multi-factor authentication", - "Name": "Name", - "Name format": "Name format", "New Email": "Email mới", "New Password": "Mật khẩu mới", "New User": "Người dùng mới", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "Upload ID card front picture", "Upload ID card with person picture": "Upload ID card with person picture", "Upload a photo": "Tải lên một bức ảnh", - "Value": "Value", "Values": "Giá trị", "Verification code sent": "Mã xác minh đã được gửi", "WebAuthn credentials": "Chứng chỉ WebAuthn", diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index f6bc18d9..9d7dd464 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -267,6 +267,7 @@ "Models": "Casbin模型", "Name": "名称", "Name - Tooltip": "唯一的、字符串式的ID", + "Name format": "名称格式", "Non-LDAP": "禁用LDAP", "None": "无", "OAuth providers": "OAuth提供方", @@ -1053,8 +1054,6 @@ "Managed accounts": "托管账户", "Modify password...": "编辑密码...", "Multi-factor authentication": "多因素认证", - "Name": "Name", - "Name format": "Name format", "New Email": "新邮箱", "New Password": "新密码", "New User": "添加用户", @@ -1092,7 +1091,6 @@ "Upload ID card front picture": "上传身份证正面照片", "Upload ID card with person picture": "上传手持身份证照片", "Upload a photo": "上传头像", - "Value": "值", "Values": "值", "Verification code sent": "验证码已发送", "WebAuthn credentials": "WebAuthn凭据", diff --git a/web/src/table/SamlAttributeTable.js b/web/src/table/SamlAttributeTable.js index 7833fab1..d69b402c 100644 --- a/web/src/table/SamlAttributeTable.js +++ b/web/src/table/SamlAttributeTable.js @@ -38,7 +38,7 @@ class SamlAttributeTable extends React.Component { } addRow(table) { - const row = {Name: "", nameformat: "", value: ""}; + const row = {Name: "", nameFormat: "", value: ""}; if (table === undefined || table === null) { table = []; } @@ -64,7 +64,7 @@ class SamlAttributeTable extends React.Component { renderTable(table) { const columns = [ { - title: i18next.t("user:Name"), + title: i18next.t("general:Name"), dataIndex: "name", key: "name", width: "200px", @@ -77,9 +77,9 @@ class SamlAttributeTable extends React.Component { }, }, { - title: i18next.t("user:Name format"), - dataIndex: "nameformat", - key: "nameformat", + title: i18next.t("general:Name format"), + dataIndex: "nameFormat", + key: "nameFormat", width: "200px", render: (text, record, index) => { return ( @@ -87,7 +87,7 @@ class SamlAttributeTable extends React.Component { value={text} defaultValue="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" onChange={value => { - this.updateField(table, index, "nameformat", value); + this.updateField(table, index, "nameFormat", value); }} > @@ -98,7 +98,7 @@ class SamlAttributeTable extends React.Component { }, }, { - title: i18next.t("user:Value"), + title: i18next.t("webhook:Value"), dataIndex: "value", key: "value", width: "200px",