From 463d351937a48397aa683db655badbe4815ae965 Mon Sep 17 00:00:00 2001 From: Florian Dupret Date: Sat, 20 Mar 2021 09:03:49 +0100 Subject: [PATCH] Localize group and sign up settings --- .../Admin/ManageUsers/GroupCard.vue | 20 ++--- .../Admin/ManageUsers/GroupDashboard.vue | 12 +-- .../Admin/ManageUsers/TheSignUpTable.vue | 84 ++++++++++--------- .../Admin/ManageUsers/TheUserTable.vue | 2 +- frontend/src/locales/messages/en.json | 23 ++++- frontend/src/locales/messages/fr.json | 25 +++++- 6 files changed, 103 insertions(+), 63 deletions(-) diff --git a/frontend/src/components/Admin/ManageUsers/GroupCard.vue b/frontend/src/components/Admin/ManageUsers/GroupCard.vue index 102c03039..8c691f73a 100644 --- a/frontend/src/components/Admin/ManageUsers/GroupCard.vue +++ b/frontend/src/components/Admin/ManageUsers/GroupCard.vue @@ -2,8 +2,8 @@
{{ group.name }} - Group ID: {{ group.id }} + {{ $t('user.group-id-with-value', { groupID: group.id }) }} @@ -36,11 +36,11 @@ @click="confirmDelete" :disabled="ableToDelete" > - Delete + {{ $t('general.delete') }} - Edit + {{ $t('general.edit') }} @@ -94,22 +94,22 @@ export default { buildData() { this.groupProps = [ { - text: "Total Users", + text: this.$t('user.total-users'), icon: "mdi-account", value: this.group.users.length, }, { - text: "Total MealPlans", + text: this.$t('user.total-mealplans'), icon: "mdi-food", value: this.group.mealplans.length, }, { - text: "Webhooks Enabled", + text: this.$t('user.webhooks-enabled'), icon: "mdi-webhook", - value: this.group.webhookEnable ? "True" : "False", + value: this.group.webhookEnable ? this.$t('general.yes') : this.$t('general.no'), }, { - text: "Webhook Time", + text: this.$t('user.webhook-time'), icon: "mdi-clock-outline", value: this.group.webhookTime, }, diff --git a/frontend/src/components/Admin/ManageUsers/GroupDashboard.vue b/frontend/src/components/Admin/ManageUsers/GroupDashboard.vue index 026411a18..ef88bf376 100644 --- a/frontend/src/components/Admin/ManageUsers/GroupDashboard.vue +++ b/frontend/src/components/Admin/ManageUsers/GroupDashboard.vue @@ -9,7 +9,7 @@ clearable class="mr-2 pt-0" append-icon="mdi-filter" - label="Filter" + :label="$t('general.filter')" single-line hide-details > @@ -24,7 +24,7 @@ v-bind="attrs" v-on="on" > - Create Group + {{ $t('user.create-group') }} @@ -34,7 +34,7 @@ - Create Group + {{ $t('user.create-group') }} @@ -44,7 +44,7 @@ @@ -53,10 +53,10 @@ - Cancel + {{ $t('general.cancel') }} - Create + {{ $t('general.create') }} diff --git a/frontend/src/components/Admin/ManageUsers/TheSignUpTable.vue b/frontend/src/components/Admin/ManageUsers/TheSignUpTable.vue index 153355244..42acc597f 100644 --- a/frontend/src/components/Admin/ManageUsers/TheSignUpTable.vue +++ b/frontend/src/components/Admin/ManageUsers/TheSignUpTable.vue @@ -2,8 +2,8 @@ - Sign Up Links + {{ $t('user.sign-up-links') }} @@ -31,7 +31,7 @@ - Create Link + {{ $t('user.create-link') }} @@ -43,13 +43,13 @@ @@ -58,10 +58,10 @@ - Cancel + {{ $t('general.cancel') }} - Save + {{ $t('general.save') }} @@ -90,7 +90,7 @@ mdi-account-cog - {{ item.admin ? "Yes" : "No" }} + {{ item.admin ? $t('general.yes') : $t('general.no') }} @@ -113,37 +113,39 @@ import { validators } from "@/mixins/validators"; export default { components: { Confirmation }, mixins: [validators], - data: () => ({ - dialog: false, - activeId: null, - activeName: null, - headers: [ - { - text: "Link ID", - align: "start", - sortable: false, - value: "id", + data() { + return { + dialog: false, + activeId: null, + activeName: null, + headers: [ + { + text: this.$t('user.link-id'), + align: "start", + sortable: false, + value: "id", + }, + { text: this.$t('general.name'), value: "name" }, + { text: this.$t('general.token'), value: "token" }, + { text: this.$t('user.admin'), value: "admin", align: "center" }, + { text: "", value: "actions", sortable: false, align: "center" }, + ], + links: [], + editedIndex: -1, + editedItem: { + name: "", + admin: false, + token: "", + id: 0, }, - { text: "Name", value: "name" }, - { text: "Token", value: "token" }, - { text: "Admin", value: "admin", align: "center" }, - { text: "", value: "actions", sortable: false, align: "center" }, - ], - links: [], - editedIndex: -1, - editedItem: { - name: "", - admin: false, - token: "", - id: 0, - }, - defaultItem: { - name: "", - token: "", - admin: false, - id: 0, - }, - }), + defaultItem: { + name: "", + token: "", + admin: false, + id: 0, + }, + } + }, computed: { baseURL() { diff --git a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue index d3fe70d4c..0c268c813 100644 --- a/frontend/src/components/Admin/ManageUsers/TheUserTable.vue +++ b/frontend/src/components/Admin/ManageUsers/TheUserTable.vue @@ -40,7 +40,7 @@ - {{$t('user.user-id')}} {{ editedItem.id }} + {{$t('user.user-id-with-value', {id: editedItem.id }) }} diff --git a/frontend/src/locales/messages/en.json b/frontend/src/locales/messages/en.json index 36aa40214..31bb04e02 100644 --- a/frontend/src/locales/messages/en.json +++ b/frontend/src/locales/messages/en.json @@ -40,7 +40,10 @@ "recent": "Recent", "sort-alphabetically": "A-Z", "reset": "Reset", - "filter": "Filter" + "filter": "Filter", + "yes": "Yes", + "no": "No", + "token": "Token" }, "page": { "home-page": "Home Page", @@ -59,12 +62,28 @@ "user-password": "User Password", "admin": "Admin", "user-id": "User ID", + "user-id-with-value": "User ID: {id}", "group": "Group", "new-user": "New User", "edit-user": "Edit User", "create-user": "Create User", "confirm-user-deletion": "Confirm User Deletion", - "are-you-sure-you-want-to-delete-the-user": "Are you sure you want to delete the user {activeName} ID: {activeId}" + "are-you-sure-you-want-to-delete-the-user": "Are you sure you want to delete the user {activeName} ID: {activeId}?", + "confirm-group-deletion": "Confirm Group Deletion", + "total-users": "Total Users", + "total-mealplans": "Total MealPlans", + "webhooks-enabled": "Webhooks Enabled", + "webhook-time": "Webhook Time", + "create-group": "Create Group", + "sign-up-links": "Sign Up Links", + "create-link": "Create Link", + "link-name": "Link Name", + "group-id-with-value": "Group ID: {groupID}", + "are-you-sure-you-want-to-delete-the-group": "Are you sure you want to delete {groupName}?", + "group-name": "Group Name", + "confirm-link-deletion": "Confirm Link Deletion", + "are-you-sure-you-want-to-delete-the-link": "Are you sure you want to delete the link {link}?", + "link-id": "Link ID" }, "meal-plan": { "shopping-list": "Shopping List", diff --git a/frontend/src/locales/messages/fr.json b/frontend/src/locales/messages/fr.json index 18d50890b..3ad137270 100644 --- a/frontend/src/locales/messages/fr.json +++ b/frontend/src/locales/messages/fr.json @@ -40,7 +40,10 @@ "sort": "Trier", "sort-alphabetically": "A-Z", "reset": "Réinitialiser", - "filter": "Filtrer" + "filter": "Filtrer", + "no": "Non", + "yes": "Oui", + "token": "Jeton" }, "page": { "home-page": "Accueil", @@ -63,8 +66,24 @@ "user-id": "ID utilisateur", "user-password": "Mot de passe de l'utilisateur", "create-user": "Créer utilisateur", - "are-you-sure-you-want-to-delete-the-user": "Êtes-vous sûr de vouloir supprimer l'utilisateur {activeName} ID : {activeId}", - "confirm-user-deletion": "Confirmer la suppression" + "are-you-sure-you-want-to-delete-the-user": "Êtes-vous sûr de vouloir supprimer l'utilisateur {activeName} ID : {activeId} ?", + "confirm-user-deletion": "Confirmer la suppression", + "confirm-group-deletion": "Confirmer la suppression du groupe", + "create-group": "Créer un groupe", + "create-link": "Créer un lien", + "group-id-with-value": "ID groupe : {groupID}", + "are-you-sure-you-want-to-delete-the-group": "Êtes-vous sûr de vouloir supprimer {groupName} ?", + "link-name": "Nom du lien", + "sign-up-links": "Liens d'inscription", + "total-mealplans": "Nombre de repas planifiés", + "total-users": "Nombre d'utilisateurs", + "user-id-with-value": "ID utilisateur : {id}", + "webhook-time": "Heure du Webhook", + "webhooks-enabled": "Webhooks activés", + "are-you-sure-you-want-to-delete-the-link": "Êtes-vous sûr de vouloir supprimer le lien {link} ?", + "confirm-link-deletion": "Confirmer la suppresion du lien", + "group-name": "Nom du groupe", + "link-id": "ID du lien" }, "meal-plan": { "shopping-list": "Liste d'achats",