From 47cb0a64e521dcc3991cafd1913efbcab798a863 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sun, 14 Mar 2021 09:54:44 +0100 Subject: [PATCH] Translate TheUserTable --- .../Admin/ManageUsers/TheUserTable.vue | 32 +++++++++---------- frontend/src/components/Login/LoginForm.vue | 6 ++-- frontend/src/components/Login/SignUpForm.vue | 6 ++-- frontend/src/components/UI/SiteMenu.vue | 4 +-- frontend/src/locales/messages/da.json | 2 +- frontend/src/locales/messages/de.json | 2 +- frontend/src/locales/messages/en.json | 19 +++++++---- frontend/src/locales/messages/fr.json | 20 ++++++++---- frontend/src/locales/messages/pl.json | 2 +- frontend/src/locales/messages/sv.json | 2 +- frontend/src/locales/messages/zh-CN.json | 2 +- frontend/src/locales/messages/zh-TW.json | 2 +- 12 files changed, 57 insertions(+), 42 deletions(-) diff --git a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue index 282a3c1f9..8418e45ce 100644 --- a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue +++ b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue @@ -52,7 +52,7 @@ @@ -60,7 +60,7 @@ @@ -70,19 +70,19 @@ dense v-model="editedItem.group" :items="existingGroups" - label="User Group" + :label="$t('user.user-group')" > - + @@ -91,10 +91,10 @@ - Cancel + {{$t('general.cancel')}} - Save + {{$t('general.save')}} @@ -113,13 +113,13 @@ mdi-delete - Delete + {{$t('general.delete')}} mdi-pencil - Edit + {{$t('general.edit')}} @@ -149,15 +149,15 @@ export default { activeName: null, headers: [ { - text: "User ID", + text: this.$t('user.user-id'), align: "start", sortable: false, value: "id", }, - { text: "Full Name", value: "fullName" }, - { text: "Email", value: "email" }, - { text: "Group", value: "group" }, - { text: "Admin", value: "admin" }, + { text: this.$t('user.full-name'), value: "fullName" }, + { text: this.$t('user.email'), value: "email" }, + { text: this.$t('user.group'), value: "group" }, + { text: this.$t('user.admin'), value: "admin" }, { text: "", value: "actions", sortable: false, align: "center" }, ], users: [], @@ -182,7 +182,7 @@ export default { computed: { formTitle() { - return this.editedIndex === -1 ? "New User" : "Edit User"; + return this.editedIndex === -1 ? this.$t('user.new-user') : this.$t('user.edit-user'); }, showPassword() { return this.editedIndex === -1 ? true : false; diff --git a/frontend/src/components/Login/LoginForm.vue b/frontend/src/components/Login/LoginForm.vue index 98a15ce42..f2625f794 100644 --- a/frontend/src/components/Login/LoginForm.vue +++ b/frontend/src/components/Login/LoginForm.vue @@ -30,7 +30,7 @@ light="light" prepend-icon="mdi-email" validate-on-blur - :label="$t('login.email')" + :label="$t('user.email')" type="email" > {{ $t("login.sign-in") }}{{ $t("user.sign-in") }} diff --git a/frontend/src/components/Login/SignUpForm.vue b/frontend/src/components/Login/SignUpForm.vue index 3ae885fdf..52baab74a 100644 --- a/frontend/src/components/Login/SignUpForm.vue +++ b/frontend/src/components/Login/SignUpForm.vue @@ -37,7 +37,7 @@ prepend-icon="mdi-email" validate-on-blur :rules="[existsRule, emailRule]" - :label="$t('login.email')" + :label="$t('user.email')" type="email" > @@ -55,7 +55,7 @@ light="light" class="mb-2s" prepend-icon="mdi-lock" - :label="$t('login.password')" + :label="$t('user.password')" :type="showPassword ? 'text' : 'password'" :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'" :rules="[ diff --git a/frontend/src/components/UI/SiteMenu.vue b/frontend/src/components/UI/SiteMenu.vue index 33b336c05..06edf22e0 100644 --- a/frontend/src/components/UI/SiteMenu.vue +++ b/frontend/src/components/UI/SiteMenu.vue @@ -71,8 +71,8 @@ export default { restricted: true, }, { - icon: "mdi-account", - title: this.$t('auth.logout'), + icon: "mdi-logout", + title: this.$t('user.logout'), restricted: true, nav: "/logout", }, diff --git a/frontend/src/locales/messages/da.json b/frontend/src/locales/messages/da.json index 161cda64e..3c21ecaff 100644 --- a/frontend/src/locales/messages/da.json +++ b/frontend/src/locales/messages/da.json @@ -30,7 +30,7 @@ "download": "Hent", "import": "Importere" }, - "login": { + "user": { "email": "E-mail", "password": "Adgangskode", "sign-in": "Log ind", diff --git a/frontend/src/locales/messages/de.json b/frontend/src/locales/messages/de.json index db7b93d0a..ddc2e913c 100644 --- a/frontend/src/locales/messages/de.json +++ b/frontend/src/locales/messages/de.json @@ -41,7 +41,7 @@ "all-recipes": "Alle Rezepte", "recent": "Neueste" }, - "login": { + "user": { "stay-logged-in": "Eingeloggt bleiben?", "email": "E-Mail", "password": "Passwort", diff --git a/frontend/src/locales/messages/en.json b/frontend/src/locales/messages/en.json index a7ebe29a1..7befdfe16 100644 --- a/frontend/src/locales/messages/en.json +++ b/frontend/src/locales/messages/en.json @@ -38,19 +38,29 @@ "confirm": "Confirm", "sort": "Sort", "recent": "Recent", - "sort-alphabetically": "A-Z" + "sort-alphabetically": "A-Z", + "reset": "Reset" }, "page": { "home-page": "Home Page", "all-recipes": "All Recipes", "recent": "Recent" }, - "login": { + "user": { "stay-logged-in": "Stay logged in?", "email": "Email", "password": "Password", "sign-in": "Sign in", - "sign-up": "Sign up" + "sign-up": "Sign up", + "logout": "Logout", + "full-name": "Full Name", + "user-group": "User Group", + "user-password": "User Password", + "admin": "Admin", + "user-id": "User ID", + "group": "Group", + "new-user": "New User", + "edit-user": "Edit User" }, "meal-plan": { "shopping-list": "Shopping List", @@ -175,8 +185,5 @@ "title": "Chowdown", "description": "Migrate data from Chowdown" } - }, - "auth": { - "logout": "Logout" } } diff --git a/frontend/src/locales/messages/fr.json b/frontend/src/locales/messages/fr.json index 95c689ead..68180e2a7 100644 --- a/frontend/src/locales/messages/fr.json +++ b/frontend/src/locales/messages/fr.json @@ -38,19 +38,29 @@ "confirm": "Confirmer", "recent": "Récent", "sort": "Trier", - "sort-alphabetically": "A-Z" + "sort-alphabetically": "A-Z", + "reset": "Réinitialiser" }, "page": { "home-page": "Accueil", "all-recipes": "Toutes mes recettes", "recent": "Récent" }, - "login": { + "user": { "stay-logged-in": "Rester connecté(e) ?", "email": "Email", "password": "Mot de passe", "sign-in": "Se connecter", - "sign-up": "S'inscrire" + "sign-up": "S'inscrire", + "logout": "Déconnexion", + "admin": "Admin", + "edit-user": "Modifier l'utilisateur", + "full-name": "Nom", + "group": "Groupe", + "new-user": "Nouvel utilisateur", + "user-group": "Groupe utilisateur", + "user-id": "ID utilisateur", + "user-password": "Mot de passe de l'utilisateur" }, "meal-plan": { "shopping-list": "Liste d'achats", @@ -176,7 +186,5 @@ "description": "Importer des recettes depuis Chowdown" } }, - "auth": { - "logout": "Déconnexion" - } + "auth": {} } diff --git a/frontend/src/locales/messages/pl.json b/frontend/src/locales/messages/pl.json index d6387b0da..0c9cd35f8 100644 --- a/frontend/src/locales/messages/pl.json +++ b/frontend/src/locales/messages/pl.json @@ -36,7 +36,7 @@ "themes": "Motywy", "confirm": "Potwierdź" }, - "login": { + "user": { "stay-logged-in": "Pozostań zalogowany", "email": "Email", "password": "Hasło", diff --git a/frontend/src/locales/messages/sv.json b/frontend/src/locales/messages/sv.json index 261df7c50..e4a192039 100644 --- a/frontend/src/locales/messages/sv.json +++ b/frontend/src/locales/messages/sv.json @@ -30,7 +30,7 @@ "download": "Ladda ner", "import": "Importera" }, - "login": { + "user": { "email": "E-mail", "password": "Lösenord", "sign-in": "Logga in", diff --git a/frontend/src/locales/messages/zh-CN.json b/frontend/src/locales/messages/zh-CN.json index 898a4fcb2..1acdd16a8 100644 --- a/frontend/src/locales/messages/zh-CN.json +++ b/frontend/src/locales/messages/zh-CN.json @@ -36,7 +36,7 @@ "themes": "布景主题", "confirm": "确定" }, - "login": { + "user": { "stay-logged-in": "保持登录状态?", "email": "电子邮件", "password": "密码", diff --git a/frontend/src/locales/messages/zh-TW.json b/frontend/src/locales/messages/zh-TW.json index 0232a1a8d..07bc98bc0 100644 --- a/frontend/src/locales/messages/zh-TW.json +++ b/frontend/src/locales/messages/zh-TW.json @@ -36,7 +36,7 @@ "themes": "佈景主題", "confirm": "確定" }, - "login": { + "user": { "stay-logged-in": "保持登錄狀態?", "email": "電子郵件", "password": "密碼",