From 2bc4cd933749c4ca86203aa0b9ee4aedce0cc707 Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Sat, 18 Mar 2023 20:42:02 +0800 Subject: [PATCH] Fix i18n issue --- web/src/auth/AuthCallback.js | 2 +- web/src/auth/LoginPage.js | 6 +++--- web/src/auth/SignupPage.js | 2 +- web/src/locales/de/data.json | 1 - web/src/locales/en/data.json | 1 - web/src/locales/es/data.json | 1 - web/src/locales/fr/data.json | 1 - web/src/locales/ja/data.json | 1 - web/src/locales/ko/data.json | 1 - web/src/locales/ru/data.json | 1 - web/src/locales/vi/data.json | 1 - web/src/locales/zh/data.json | 1 - 12 files changed, 5 insertions(+), 14 deletions(-) diff --git a/web/src/auth/AuthCallback.js b/web/src/auth/AuthCallback.js index 428ca231..84a969a8 100644 --- a/web/src/auth/AuthCallback.js +++ b/web/src/auth/AuthCallback.js @@ -139,7 +139,7 @@ class AuthCallback extends React.Component { window.location.href = newUrl.toString(); } } else { - Setting.showMessage("error", `Failed to log in: ${res.msg}`); + Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); } }); return; diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index c451039f..9c2abca5 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -227,7 +227,7 @@ class LoginPage extends React.Component { Setting.goToLinkSoft(ths, `/prompt/${application.name}?redirectUri=${oAuthParams.redirectUri}&code=${code}&state=${oAuthParams.state}`); } } else { - Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`); + Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); } }); } else { @@ -290,7 +290,7 @@ class LoginPage extends React.Component { window.location.href = newUrl.toString(); } } else { - Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`); + Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); } }); } else { @@ -328,7 +328,7 @@ class LoginPage extends React.Component { } } } else { - Setting.showMessage("error", `${i18next.t("application:Failed to log in")}: ${res.msg}`); + Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); } }); } diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js index ec8d5176..2d2db43a 100644 --- a/web/src/auth/SignupPage.js +++ b/web/src/auth/SignupPage.js @@ -173,7 +173,7 @@ class SignupPage extends React.Component { this.onUpdateAccount(account); Setting.goToLinkSoft(this, this.getResultPath(application)); } else { - Setting.showMessage("error", `Failed to sign in: ${res.msg}`); + Setting.showMessage("error", `${i18next.t("application:Failed to sign in")}: ${res.msg}`); } }); } else { diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json index 61c93317..c63e1618 100644 --- a/web/src/locales/de/data.json +++ b/web/src/locales/de/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Ob Casdoor eine Sitzung aufrechterhält, nachdem man sich von der Anwendung aus bei Casdoor angemeldet hat", "Enable signup": "Aktivieren Sie die Registrierung", "Enable signup - Tooltip": "Ob Benutzern erlaubt werden soll, ein neues Konto zu registrieren", - "Failed to log in": "Fehler beim Einloggen", "Failed to sign in": "Fehler bei der Anmeldung", "File uploaded successfully": "Datei erfolgreich hochgeladen", "Follow organization theme": "Folge dem Thema der Organisation", diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json index 79d2b5d8..8209af38 100644 --- a/web/src/locales/en/data.json +++ b/web/src/locales/en/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Whether Casdoor maintains a session after logging into Casdoor from the application", "Enable signup": "Enable signup", "Enable signup - Tooltip": "Whether to allow users to register a new account", - "Failed to log in": "Failed to log in", "Failed to sign in": "Failed to sign in", "File uploaded successfully": "File uploaded successfully", "Follow organization theme": "Follow organization theme", diff --git a/web/src/locales/es/data.json b/web/src/locales/es/data.json index 86e6ecdd..b3fb3a5d 100644 --- a/web/src/locales/es/data.json +++ b/web/src/locales/es/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Si Casdoor mantiene una sesión después de iniciar sesión en Casdoor desde la aplicación", "Enable signup": "Habilitar registro", "Enable signup - Tooltip": "Ya sea permitir que los usuarios registren una nueva cuenta", - "Failed to log in": "No se pudo iniciar sesión", "Failed to sign in": "Error al iniciar sesión", "File uploaded successfully": "Archivo subido exitosamente", "Follow organization theme": "Seguir el tema de la organización", diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json index 17f439e1..9ce94867 100644 --- a/web/src/locales/fr/data.json +++ b/web/src/locales/fr/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Que Casdoor conserve une session après s'être connecté à Casdoor à partir de l'application", "Enable signup": "Activer l'inscription", "Enable signup - Tooltip": "Doit-on autoriser les utilisateurs à créer un nouveau compte ?", - "Failed to log in": "Échec de la connexion", "Failed to sign in": "Échec de la connexion", "File uploaded successfully": "Fichier téléchargé avec succès", "Follow organization theme": "Suivre le thème de l'organisation", diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json index 3607d734..047d8b9e 100644 --- a/web/src/locales/ja/data.json +++ b/web/src/locales/ja/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Enable signin session - Tooltip", "Enable signup": "サインアップを有効にする", "Enable signup - Tooltip": "Whether to allow users to sign up", - "Failed to log in": "Failed to log in", "Failed to sign in": "Failed to sign in", "File uploaded successfully": "ファイルが正常にアップロードされました", "Follow organization theme": "Follow organization theme", diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json index d8539c54..dbab6237 100644 --- a/web/src/locales/ko/data.json +++ b/web/src/locales/ko/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Enable signin session - Tooltip", "Enable signup": "Enable signup", "Enable signup - Tooltip": "Whether to allow users to sign up", - "Failed to log in": "Failed to log in", "Failed to sign in": "Failed to sign in", "File uploaded successfully": "File uploaded successfully", "Follow organization theme": "Follow organization theme", diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json index 7a21a9f6..a8b7b50c 100644 --- a/web/src/locales/ru/data.json +++ b/web/src/locales/ru/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Включить сеанс входа - Подсказка", "Enable signup": "Включить регистрацию", "Enable signup - Tooltip": "Whether to allow users to sign up", - "Failed to log in": "Failed to log in", "Failed to sign in": "Failed to sign in", "File uploaded successfully": "Файл успешно загружен", "Follow organization theme": "Follow organization theme", diff --git a/web/src/locales/vi/data.json b/web/src/locales/vi/data.json index 2405c1ed..aaa194fe 100644 --- a/web/src/locales/vi/data.json +++ b/web/src/locales/vi/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "Enable signin session - Tooltip", "Enable signup": "Enable signup", "Enable signup - Tooltip": "Enable signup - Tooltip", - "Failed to log in": "Failed to log in", "Failed to sign in": "Failed to sign in", "File uploaded successfully": "File uploaded successfully", "Follow organization theme": "Follow organization theme", diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index 2eed58b6..e582e51c 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -40,7 +40,6 @@ "Enable signin session - Tooltip": "从应用登录Casdoor后，Casdoor是否保持会话", "Enable signup": "启用注册", "Enable signup - Tooltip": "是否允许用户注册", - "Failed to log in": "登录失败", "Failed to sign in": "登录失败", "File uploaded successfully": "文件上传成功", "Follow organization theme": "使用组织主题",