From 0e77d4b68f9f62d2516337179bb6ab5e7d98d33e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 10:40:40 +0200
Subject: [PATCH] refactor: refs #7132 account's module translations

---
 src/pages/Account/AccountCreate.vue           |  8 +--
 src/pages/Account/AccountFilter.vue           |  2 +-
 src/pages/Account/AccountLdap.vue             |  8 +--
 src/pages/Account/AccountSamba.vue            |  6 +--
 src/pages/Account/Alias/AliasCreateForm.vue   |  7 +--
 .../Account/Alias/Card/AliasBasicData.vue     |  4 +-
 .../Account/Alias/Card/AliasDescriptor.vue    |  2 +-
 src/pages/Account/Alias/Card/AliasSummary.vue |  4 +-
 src/pages/Account/Card/AccountBasicData.vue   |  2 +-
 src/pages/Account/Role/AccountRolesFilter.vue |  2 +-
 src/pages/Account/Role/Card/RoleBasicData.vue |  7 +--
 .../Account/Role/Card/RoleDescriptor.vue      |  2 +-
 src/pages/Account/Role/Card/RoleForm.vue      |  7 +--
 src/pages/Account/Role/Card/RoleSummary.vue   |  6 +--
 src/pages/Account/locale/en.yml               | 49 ++----------------
 src/pages/Account/locale/es.yml               | 50 ++-----------------
 16 files changed, 35 insertions(+), 131 deletions(-)

diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
index e584a1acd..6b7c049c8 100644
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@@ -37,7 +37,7 @@ const redirectToAccountBasicData = (_, { id }) => {
             <div class="column q-gutter-sm">
                 <VnInput
                     v-model="data.name"
-                    :label="t('account.create.name')"
+                    :label="t('globals.name')"
                     :rules="validate('VnUser.name')"
                 />
                 <VnInput
@@ -47,12 +47,12 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.email"
-                    :label="t('account.create.email')"
+                    :label="t('globals.params.email')"
                     type="email"
                     :rules="validate('VnUser.email')"
                 />
                 <VnSelect
-                    :label="t('account.create.role')"
+                    :label="t('account.card.role')"
                     v-model="data.roleFk"
                     :options="rolesOptions"
                     option-value="id"
@@ -63,7 +63,7 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.password"
-                    :label="t('account.create.password')"
+                    :label="t('ldap.password')"
                     type="password"
                     :rules="validate('VnUser.password')"
                 />
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
index 1775aa06b..22c167d43 100644
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@@ -44,7 +44,7 @@ const rolesOptions = ref([]);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('account.card.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 7b8433e73..84d8f1cde 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -102,11 +102,11 @@ onMounted(async () => await getInitialLdapConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('ldap.testConnection')"
+                    :label="t('account.card.testConnection')"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('ldap.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('ldap.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
@@ -146,7 +146,7 @@ onMounted(async () => await getInitialLdapConfig());
                     />
                     <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
                     <VnInput
-                        :label="t('ldap.groupDN')"
+                        :label="t('account.card.groupDN')"
                         clearable
                         v-model="data.groupDn"
                     />
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 7af9f4364..15b886f27 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -110,12 +110,12 @@ onMounted(async () => await getInitialSambaConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('samba.testConnection')"
+                    :label="t('account.card.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('samba.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -123,7 +123,7 @@ onMounted(async () => await getInitialSambaConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('samba.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
index b21099555..e401b6d54 100644
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -36,15 +36,12 @@ const onDataSaved = ({ id }) => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                    <VnInput v-model="data.alias" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index ba940cda5..c78dfb4df 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -11,8 +11,8 @@ const { t } = useI18n();
     <FormModel model="Alias">
         <template #form="{ data }">
             <div class="column q-gutter-y-md">
-                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <VnInput v-model="data.alias" :label="t('globals.name')" />
+                <VnInput v-model="data.description" :label="t('role.description')" />
                 <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
             </div>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 963f84547..713cecf75 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -71,7 +71,7 @@ const removeAlias = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index b2dc1f0fc..1f76fe7c2 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -42,8 +42,8 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+                <VnLv :label="t('role.id')" :value="alias.id" />
+                <VnLv :label="t('role.description')" :value="alias.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index f1cdaf9df..e6c9da6fe 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -36,7 +36,7 @@ watch(
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="t('account.card.nickname')" />
                 <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('account.card.email')" />
+                <VnInput v-model="data.email" :label="t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index 8340b965d..ff4411897 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -29,7 +29,7 @@ const props = defineProps({
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('role.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index 56f4f0c27..1de9ff387 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -12,15 +12,12 @@ const { t } = useI18n();
         <template #form="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index e4af3ed13..af018565a 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -58,7 +58,7 @@ const removeRole = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.card.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
index 382639beb..09a098085 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -22,15 +22,12 @@ const { t } = useI18n();
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index 76c72e947..fef85f919 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -44,9 +44,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.card.id')" :value="role.id" />
-                <VnLv :label="t('role.card.name')" :value="role.name" />
-                <VnLv :label="t('role.card.description')" :value="role.description" />
+                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('role.description')" :value="role.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index fe8707eb8..f2f563923 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -1,32 +1,15 @@
 account:
-    pageTitles:
-        users: Users
-        list: Users
-        roles: Roles
-        alias: Mail aliasses
-        accounts: Accounts
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Connections
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-        newRole: New role
-        privileges: Privileges
-        mailAlias: Mail Alias
-        mailForwarding: Mail Forwarding
-        accountCreate: New user
-        aliasUsers: Users
     card:
-        name: Name
         nickname: User
         role: Role
-        email: Email
         alias: Alias
         lang: Language
         roleFk: Role
         newUser: New user
         ticketTracking: Ticket tracking
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Can delegate privileges
         enabled: Account enabled!
@@ -74,11 +57,7 @@ account:
     search: Search user
     searchInfo: You can search by id, name or nickname
     create:
-        name: Name
         nickname: Nickname
-        email: Email
-        role: Role
-        password: Password
         active: Active
     mailForwarding:
         forwardingMail: Forward email
@@ -86,50 +65,30 @@ account:
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
-    pageTitles:
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-    card:
-        description: Description
-        id: Id
-        name: Name
     newRole: New role
     searchRoles: Search role
     searchInfo: Search role by id or name
-    name: Name
     description: Description
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Users
     search: Search mail alias
     searchInfo: Search alias by id or name
-    alias: Alias
-    description: Description
-    id: Id
     newAlias: New alias
-    name: Name
     isPublic: Public
 ldap:
-    enableSync: Enable synchronization
     server: Server
     rdn: RDN
     userDN: User DN
     filter: Filter
-    groupDN: Group DN
-    testConnection: Test connection
     success: LDAP connection established!
     password: Password
 samba:
-    enableSync: Enable synchronization
     domainController: Domain controller
     domainAD: AD domain
     userAD: AD user
-    groupDN: Group DN
     passwordAD: AD password
     domainPart: User DN (without domain part)
     verifyCertificate: Verify certificate
-    testConnection: Test connection
     success: Samba connection established!
 accounts:
     homedir: Homedir base
@@ -147,8 +106,6 @@ connections:
     created: Created
     killSession: Kill session
 acls:
-    role: Role
-    accessType: Access type
     permissions: Permission
     search: Search acls
     searchInfo: Search acls by model name
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 112ffe9cc..ba559f2c3 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -1,27 +1,7 @@
 account:
-    pageTitles:
-        users: Usuarios
-        list: Usuarios
-        roles: Roles
-        alias: Alias de correo
-        accounts: Cuentas
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Conexiones
-        inheritedRoles: Roles heredados
-        newRole: Nuevo rol
-        subRoles: Subroles
-        privileges: Privilegios
-        mailAlias: Alias de correo
-        mailForwarding: Reenvío de correo
-        accountCreate: Nuevo usuario
-        aliasUsers: Usuarios
     card:
         nickname: Usuario
-        name: Nombre
         role: Rol
-        email: Mail
         alias: Alias
         lang: Idioma
         roleFk: Rol
@@ -33,6 +13,9 @@ account:
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
         twoFactor: Doble factor
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Puede delegar privilegios
         actions:
@@ -73,11 +56,7 @@ account:
     search: Buscar usuario
     searchInfo: Puedes buscar por id, nombre o usuario
     create:
-        name: Nombre
         nickname: Nombre mostrado
-        email: Email
-        role: Rol
-        password: Contraseña
         active: Activo
     mailForwarding:
         forwardingMail: Dirección de reenvío
@@ -85,51 +64,30 @@ account:
         enableMailForwarding: Habilitar redirección de correo
         mailInputInfo: Todos los correos serán reenviados a la dirección especificada, no se mantendrá copia de los mismos en el buzón del usuario.
 role:
-    pageTitles:
-        inheritedRoles: Roles heredados
-        subRoles: Subroles
-        newRole: Nuevo rol
-    card:
-        description: Descripción
-        id: Id
-        name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
     searchInfo: Buscar rol por id o nombre
-    name: Nombre
     description: Descripción
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Usuarios
     search: Buscar alias de correo
     searchInfo: Buscar alias por id o nombre
-    alias: Alias
-    description: Descripción
-    id: Id
     newAlias: Nuevo alias
-    name: Nombre
     isPublic: Público
 ldap:
     password: Contraseña
-    enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
     userDN: DN usuarios
     filter: Filtro
-    groupDN: DN grupos
-    testConnection: Probar conexión
     success: ¡Conexión con LDAP establecida!
 samba:
-    enableSync: Habilitar sincronización
     domainController: Controlador de dominio
     domainAD: Dominio AD
-    groupDN: DN grupos
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
     verifyCertificate: Verificar certificado
-    testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:
     homedir: Directorio base para carpetas de usuario
@@ -147,8 +105,6 @@ connections:
     created: Creado
     killSession: Matar sesión
 acls:
-    role: Rol
-    accessType: Tipo de acceso
     permissions: Permiso
     search: Buscar acls
     searchInfo: Buscar acls por nombre