Adjust dal alteration translations

cortezaproject · Nov 24, 2023 · ba01c12 · ba01c12
1 parent 26c819e
commit ba01c12
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 33 deletions.
diff --git a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
@@ -21,20 +21,20 @@
           <b-th
             class="text-primary"
           >
-            {{ $t('alteration') }}
+            {{ $t('columns.alteration') }}
           </b-th>
 
           <b-th
             class="text-primary"
             style="max-width: 300px;"
           >
-            {{ $t('change') }}
+            {{ $t('columns.change') }}
           </b-th>
 
           <b-th
             class="text-primary text-center"
           >
-            {{ $t('status') }}
+            {{ $t('columns.status') }}
           </b-th>
 
           <b-th style="min-width: 200px;" />
@@ -168,7 +168,7 @@ import { compose } from '@cortezaproject/corteza-js'
 export default {
   i18nOptions: {
     namespaces: 'module',
-    keyPrefix: 'schemaAlterations',
+    keyPrefix: 'edit.schemaAlterations',
   },
 
   props: {
@@ -238,7 +238,7 @@ export default {
 
       this.$SystemAPI.dalSchemaAlterationDismiss({ alterationID }).then(() => {
         this.toastSuccess(this.$t('notification:module.schemaAlterations.dismiss.success'))
-      }).catch(this.toastErrorHandler(this.$t('notification:schemaAlterations.dismiss.error')))
+      }).catch(this.toastErrorHandler(this.$t('notification:module.schemaAlterations.dismiss.error')))
         .finally(() => {
           for (const a of alteration) {
             a.processing = false
@@ -261,7 +261,7 @@ export default {
 
       this.$SystemAPI.dalSchemaAlterationApply({ alterationID }).then(() => {
         this.toastSuccess(this.$t('notification:module.schemaAlterations.resolve.success'))
-      }).catch(this.toastErrorHandler(this.$t('notification:schemaAlterations.resolve.error')))
+      }).catch(this.toastErrorHandler(this.$t('notification:module.schemaAlterations.resolve.error')))
         .finally(() => {
           for (const a of alteration) {
             a.processing = false
@@ -331,12 +331,12 @@ export default {
       return this.$t('params.attribute.reEncode', { ident: attr.ident, toType: to.type })
     },
 
-    stringifyModelAddParams ({ attr = {} }) {
-      return this.$t('params.model.add', { ident: attr.ident })
+    stringifyModelAddParams ({ model = {} }) {
+      return this.$t('params.model.add', { ident: model.ident })
     },
 
-    stringifyModelDeleteParams ({ attr = {} }) {
-      return this.$t('params.model.delete', { ident: attr.ident })
+    stringifyModelDeleteParams ({ model = {} }) {
+      return this.$t('params.model.delete', { ident: model.ident })
     },
 
     canDismiss (alteration) {

diff --git a/locale/en/corteza-webapp-compose/module.yaml b/locale/en/corteza-webapp-compose/module.yaml
@@ -84,16 +84,16 @@ edit:
 
   schemaAlterations:
     title: Schema alterations
-    columns:
-      alteration: Alteration
-      change: Change
-      status: Status
     resolve: Resolve
     resolveAuto: Resolve automatically
     resolved: Resolved
     dismiss: Dismiss
     waitingFor: 'Waiting for {{id}}'
     noAlterations: No schema alterations need to be resolved
+    columns:
+      alteration: Alteration
+      change: Change
+      status: Status
     params:
       attribute:
         add: Add column {{ident}} encoded as {{storeType}} of type {{attrType}}
@@ -103,6 +103,7 @@ edit:
       model:
         add: Add schema for model {{ident}}
         delete: Delete schema for model {{ident}}
+
   config:
     dal:
       title: Data store
@@ -256,22 +257,3 @@ searchPlaceholder: Type here to search all modules in this namespace
 title: List of Modules
 tooltip:
   permissions: Module permissions
-
-schemaAlterations:
-  title: Schema Alterations
-  alteration: AlterationID
-  change: Change
-  status: Status
-  resolve: Resolve
-  resolveAuto: Resolve automatically
-  dismiss: Dismiss
-
-  params:
-    attribute:
-      add: Add attribute
-      delete: Delete attribute
-      reType: Change attribute type
-      reEncode: Change attribute encoding
-    model:
-      add: Add model
-      delete: Delete model