From df35a952d1b6b8fbc27e87480a3ba6a9a248a0b0 Mon Sep 17 00:00:00 2001 From: Kitteh Date: Wed, 26 May 2021 11:40:14 +0100 Subject: [PATCH] Rename some things. --- src/pages/Login.tsx | 8 ++++---- src/pages/Me.tsx | 10 +++++----- src/pages/PwGen.tsx | 4 ++-- src/pages/Unseal.tsx | 4 ++-- src/translations/en.js | 26 +++++++++++++------------- src/translations/fr.js | 22 +++++++++++----------- src/translations/ru.js | 26 +++++++++++++------------- 7 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 4bf5309..177c9e3 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -22,7 +22,7 @@ export class TokenLoginForm extends Component<{ page: Page }, unknown> { id="tokenInput" name="token" type="password" - placeholder={i18next.t("token_input")} + placeholder={i18next.t("log_in_token_input")} required /> @@ -47,7 +47,7 @@ export class TokenLoginForm extends Component<{ page: Page }, unknown> { const error = e as Error; document.getElementById("tokenInput").classList.add("uk-form-danger"); if (error.message == "permission denied") { - setErrorText(i18next.t("token_login_error")); + setErrorText(i18next.t("log_in_token_login_error")); } else { setErrorText(error.message); } @@ -69,7 +69,7 @@ export class UsernameLoginForm extends Component<{ page: Page }, unknown> { id="usernameInput" name="username" type="text" - placeholder={i18next.t("username_input")} + placeholder={i18next.t("log_in_username_input")} required /> @@ -79,7 +79,7 @@ export class UsernameLoginForm extends Component<{ page: Page }, unknown> { id="passwordInput" name="password" type="password" - placeholder={i18next.t("password_input")} + placeholder={i18next.t("log_in_password_input")} required /> diff --git a/src/pages/Me.tsx b/src/pages/Me.tsx index 81dff94..e4e34bc 100644 --- a/src/pages/Me.tsx +++ b/src/pages/Me.tsx @@ -49,11 +49,11 @@ export class MePage extends Page { await this.router.changePage("HOME"); }} > - {i18next.t("log_out_btn")} + {i18next.t("me_log_out_btn")}
  • - +
  • - {i18next.t("renew_lease_btn")} + {i18next.t("me_renew_lease_btn")}
  • {canSealVault && ( @@ -78,7 +78,7 @@ export class MePage extends Page { await this.router.changePage("UNSEAL"); }} > - {i18next.t("seal_vault_btn")} + {i18next.t("me_seal_vault_btn")} )} @@ -88,7 +88,7 @@ export class MePage extends Page { await this.router.changePage("SET_LANGUAGE"); }} > - {i18next.t("change_language_btn")} + {i18next.t("me_change_language_btn")} , diff --git a/src/pages/PwGen.tsx b/src/pages/PwGen.tsx index f0fa980..448f8b7 100644 --- a/src/pages/PwGen.tsx +++ b/src/pages/PwGen.tsx @@ -63,7 +63,7 @@ export class PasswordGenerator extends Component(); getPasswordLengthText(length: number): string { - return i18next.t("password_length_title", { + return i18next.t("password_generator_length_title", { min: length, max: passwordLengthMax, }); @@ -130,7 +130,7 @@ export class PasswordGenerator extends Component diff --git a/src/pages/Unseal.tsx b/src/pages/Unseal.tsx index 48f6d7a..f32fc9b 100644 --- a/src/pages/Unseal.tsx +++ b/src/pages/Unseal.tsx @@ -31,13 +31,13 @@ export function UnsealFormInput(props: UnsealFormInputProps): JSX.Element { class="uk-input uk-form-width-medium" name="unsealKey" type="password" - placeholder={i18next.t("key_input_placeholder")} + placeholder={i18next.t("unseal_key_input_placeholder")} required /> diff --git a/src/translations/en.js b/src/translations/en.js index 5045fe6..5e913a0 100644 --- a/src/translations/en.js +++ b/src/translations/en.js @@ -30,11 +30,11 @@ module.exports = { // Me Page me_page_title: "Me/Settings", - log_out_btn: "Log Out", - seal_vault_btn: "Seal Vault", - copy_token_btn: "Copy Token", - renew_lease_btn: "Renew Token Lease", - change_language_btn: "Change Language", + me_log_out_btn: "Log Out", + me_seal_vault_btn: "Seal Vault", + me_copy_token_btn: "Copy Token", + me_renew_lease_btn: "Renew Token Lease", + me_change_language_btn: "Change Language", // Home Page home_page_title: "Home", @@ -79,10 +79,10 @@ module.exports = { // Unseal Page unseal_vault_text: "Unseal the Vault", - submit_key_btn: "Submit Key", + unseal_submit_key_btn: "Submit Key", unseal_input_btn: "Switch to Manual Key Input", unseal_qr_btn: "Switch to QR Key Input", - key_input_placeholder: "Key", + unseal_key_input_placeholder: "Key", unseal_keys_progress: "Keys: {{progress}}/{{keys_needed}}", // Language Selector Page @@ -91,18 +91,18 @@ module.exports = { // Password Generator Page password_generator_title: "Password Generator", - password_length_title: "Password Length ({{min}}/{{max}})", - gen_password_btn: "Generate Password", + password_generator_length_title: "Password Length ({{min}}/{{max}})", + password_generator_generate_btn: "Generate Password", // Login Page log_in_title: "Login", log_in_with_token: "Token", log_in_with_username: "Username", - token_input: "Token", - username_input: "Username", - password_input: "Password", + log_in_token_input: "Token", + log_in_username_input: "Username", + log_in_password_input: "Password", log_in_btn: "Login", - token_login_error: "Invalid Token", + log_in_token_login_error: "Invalid Token", // Key Value Delete Page kv_delete_title: "K/V Delete", diff --git a/src/translations/fr.js b/src/translations/fr.js index db70b34..53c318b 100644 --- a/src/translations/fr.js +++ b/src/translations/fr.js @@ -23,11 +23,11 @@ module.exports = { // Me Page me_page_title: "Profil/Paramètres", - log_out_btn: "Déconnexion", - seal_vault_btn: "Verrouiller le coffre", - copy_token_btn: "Copier le jeton", - renew_lease_btn: "Renouveler le jeton", - change_language_btn: "Changer la langue", + me_log_out_btn: "Déconnexion", + me_seal_vault_btn: "Verrouiller le coffre", + me_copy_token_btn: "Copier le jeton", + me_renew_lease_btn: "Renouveler le jeton", + me_change_language_btn: "Changer la langue", // Home Page home_page_title: "Accueil", @@ -37,10 +37,10 @@ module.exports = { // Unseal Page unseal_vault_text: "Ouvrir le Vault", - submit_key_btn: "Ajouter la clé", + unseal_submit_key_btn: "Ajouter la clé", unseal_input_btn: "Basculer en entrée de clé manuelle", unseal_qr_btn: "Basculer en entrée de QR code", - key_input_placeholder: "Clé", + unseal_key_input_placeholder: "Clé", unseal_keys_progress: "Clés: {{progress}}/{{keys_needed}}", // Language Selector Page @@ -49,15 +49,15 @@ module.exports = { // Password Generator Page password_generator_title: "Générateur de mot de passe", - gen_password_btn: "Générer le mot de passe", + password_generator_generate_btn: "Générer le mot de passe", // Login Page log_in_title: "Connexion", log_in_with_token: "Jeton", log_in_with_username: "Nom d'utilisateur", - token_input: "Jeton", - username_input: "Nom d'utilisateur", - password_input: "Mot de passe", + log_in_token_input: "Jeton", + log_in_username_input: "Nom d'utilisateur", + log_in_password_input: "Mot de passe", log_in_btn: "Se connecter", // Key Value Delete Page diff --git a/src/translations/ru.js b/src/translations/ru.js index 8e4c03e..8eb163b 100644 --- a/src/translations/ru.js +++ b/src/translations/ru.js @@ -30,11 +30,11 @@ module.exports = { // Me Page me_page_title: "Профиль/параметры", - log_out_btn: "Выход", - seal_vault_btn: "Закрыть хранилище", - copy_token_btn: "Копировать код доступа", - renew_lease_btn: "Продлить действие кода доступа", - change_language_btn: "Выбор языка", + me_log_out_btn: "Выход", + me_seal_vault_btn: "Закрыть хранилище", + me_copy_token_btn: "Копировать код доступа", + me_renew_lease_btn: "Продлить действие кода доступа", + me_change_language_btn: "Выбор языка", // Home Page home_page_title: "Главная страница", @@ -80,10 +80,10 @@ module.exports = { // Unseal Page unseal_vault_text: "Раскрыть хранилище", - submit_key_btn: "Отправить ключ", + unseal_submit_key_btn: "Отправить ключ", unseal_input_btn: "Ввести ключ вручную", unseal_qr_btn: "Ввести ключ через QR-код", - key_input_placeholder: "Ключ", + unseal_key_input_placeholder: "Ключ", unseal_keys_progress: "Ключи: {{progress}}/{{keys_needed}}", // Language Selector Page @@ -92,18 +92,18 @@ module.exports = { // Password Generator Page password_generator_title: "Генератор паролей", - password_length_title: "Длина пароля ({{min}}/{{max}})", - gen_password_btn: "Генерировать", + password_generator_length_title: "Длина пароля ({{min}}/{{max}})", + password_generator_generate_btn: "Генерировать", // Login Page log_in_title: "Вход", log_in_with_token: "Вход с кодом доступа", log_in_with_username: "Вход по имени", - token_input: "Код доступа", - username_input: "Имя пользователя", - password_input: "Пароль", + log_in_token_input: "Код доступа", + log_in_username_input: "Имя пользователя", + log_in_password_input: "Пароль", log_in_btn: "Войти", - token_login_error: "Неправильный код доступа", + log_in_token_login_error: "Неправильный код доступа", // Key Value Delete Page kv_delete_title: "Удаление ключа/значения",