Change the n items to n resource name in record lists

cortezaproject · May 30, 2023 · 0fcbec0 · 0fcbec0
1 parent fc16955
commit 0fcbec0
Show file tree

Hide file tree

Showing 26 changed files with 111 additions and 19 deletions.
diff --git a/client/web/admin/src/components/Apigw/CRouteList.vue b/client/web/admin/src/components/Apigw/CRouteList.vue
@@ -30,6 +30,9 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.route.single'),
+        resourcePlural: $t('general:label.route.plural')
+
       }"
       class="h-100"
       @search="filterList"

diff --git a/client/web/admin/src/components/Connection/CExternalConnectionList.vue b/client/web/admin/src/components/Connection/CExternalConnectionList.vue
@@ -29,6 +29,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.connection.single'),
+        resourcePlural: $t('general:label.connection.plural')
       }"
       hide-search
       class="h-100"

diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
@@ -23,6 +23,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.session.single'),
+        resourcePlural: $t('general:label.session.plural')
       }"
       sticky-header
       hide-search

diff --git a/client/web/admin/src/views/Automation/Workflow/List.vue b/client/web/admin/src/views/Automation/Workflow/List.vue
@@ -57,6 +57,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.workflow.single'),
+        resourcePlural: $t('general:label.workflow.plural')
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/admin/src/views/System/Application/List.vue b/client/web/admin/src/views/System/Application/List.vue
@@ -58,6 +58,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.application.single'),
+        resourcePlural: $t('general:label.application.plural'),
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/admin/src/views/System/AuthClient/List.vue b/client/web/admin/src/views/System/AuthClient/List.vue
@@ -46,6 +46,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.auth_client.single'),
+        resourcePlural: $t('general:label.auth_client.plural'),
       }"
       sticky-header
       hide-search

diff --git a/client/web/admin/src/views/System/Queue/List.vue b/client/web/admin/src/views/System/Queue/List.vue
@@ -49,6 +49,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.queue.single'),
+        resourcePlural: $t('general:label.queue.plural'),
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/admin/src/views/System/Role/List.vue b/client/web/admin/src/views/System/Role/List.vue
@@ -67,6 +67,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.role.single'),
+        resourcePlural: $t('general:label.role.plural'),
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/admin/src/views/System/SensitivityLevel/List.vue b/client/web/admin/src/views/System/SensitivityLevel/List.vue
@@ -35,6 +35,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.sensitivity_level.single'),
+        resourcePlural: $t('general:label.sensitivity_level.plural'),
       }"
       sticky-header
       hide-search

diff --git a/client/web/admin/src/views/System/Template/List.vue b/client/web/admin/src/views/System/Template/List.vue
@@ -67,6 +67,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.template.single'),
+        resourcePlural: $t('general:label.template.plural'),
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/admin/src/views/System/User/List.vue b/client/web/admin/src/views/System/User/List.vue
@@ -75,6 +75,8 @@
         singlePluralPagination: 'admin:general.pagination.single',
         prevPagination: $t('admin:general.pagination.prev'),
         nextPagination: $t('admin:general.pagination.next'),
+        resourceSingle: $t('general:label.user.single'),
+        resourcePlural: $t('general:label.user.plural'),
       }"
       sticky-header
       class="custom-resource-list-height"

diff --git a/client/web/compose/src/views/Admin/Charts/List.vue b/client/web/compose/src/views/Admin/Charts/List.vue
@@ -23,6 +23,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.chart.single'),
+        resourcePlural: $t('general:label.chart.plural'),
       }"
       clickable
       sticky-header

diff --git a/client/web/compose/src/views/Admin/Modules/Edit.vue b/client/web/compose/src/views/Admin/Modules/Edit.vue
@@ -113,7 +113,7 @@
                         :title="module.name || module.handle || module.moduleID"
                         :target="module.name || module.handle || module.moduleID"
                         :resource="`corteza::compose:module/${namespace.namespaceID}/${module.moduleID}`"
-                        :button-label="$t('general:label.module')"
+                        :button-label="$t('general:label.module.single')"
                         :show-button-icon="false"
                         button-variant="white text-left w-100"
                       />

diff --git a/client/web/compose/src/views/Admin/Modules/List.vue b/client/web/compose/src/views/Admin/Modules/List.vue
@@ -24,6 +24,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.module.single'),
+        resourcePlural: $t('general:label.module.plural'),
       }"
       clickable
       sticky-header
@@ -77,7 +79,7 @@
               <b-dropdown-item>
                 <c-permissions-button
                   :resource="`corteza::compose:module/${namespace.namespaceID}/*`"
-                  :button-label="$t('general:label.module')"
+                  :button-label="$t('general:label.module.single')"
                   :show-button-icon="false"
                   button-variant="white text-left w-100"
                 />

diff --git a/client/web/compose/src/views/Namespace/Manage.vue b/client/web/compose/src/views/Namespace/Manage.vue
@@ -40,6 +40,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.namespace.single'),
+        resourcePlural: $t('general:label.namespace.plural'),
       }"
       clickable
       sticky-header

diff --git a/client/web/privacy/src/views/Privacy/Request/List.vue b/client/web/privacy/src/views/Privacy/Request/List.vue
@@ -24,6 +24,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.privacy_request.single'),
+        resourcePlural: $t('general:label.privacy_request.plural'),
       }"
       :is-item-selectable="isItemSelectable"
       selectable

diff --git a/client/web/privacy/src/views/Privacy/SensitiveData.vue b/client/web/privacy/src/views/Privacy/SensitiveData.vue
@@ -23,6 +23,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.sensitive_module.single'),
+        resourcePlural: $t('general:label.sensitive_module.plural'),
       }"
       clickable
       hide-total

diff --git a/client/web/reporter/src/views/Report/List.vue b/client/web/reporter/src/views/Report/List.vue
@@ -23,6 +23,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:label.report.single'),
+        resourcePlural: $t('general:label.report.plural')
       }"
       sticky-header
       clickable

diff --git a/client/web/workflow/src/views/Workflow/List.vue b/client/web/workflow/src/views/Workflow/List.vue
@@ -23,6 +23,8 @@
         singlePluralPagination: 'general:resourceList.pagination.single',
         prevPagination: $t('general:resourceList.pagination.prev'),
         nextPagination: $t('general:resourceList.pagination.next'),
+        resourceSingle: $t('general:workflow.single'),
+        resourcePlural: $t('general:workflow.plural')
       }"
       clickable
       sticky-header

diff --git a/lib/vue/src/components/resourceList/CResourceList.vue b/lib/vue/src/components/resourceList/CResourceList.vue
@@ -318,6 +318,7 @@ export default {
         from: ((page - 1) * limit) + 1,
         to: limit > 0 ? Math.min((page * limit), total) : total,
         count: total,
+        data: total == 1 ? this.translations.resourceSingle : this.translations.resourcePlural
       }
 
       return this.$t(this.translations[total > limit ? 'showingPagination' : 'singlePluralPagination'], pagination)

diff --git a/locale/en/corteza-webapp-admin/admin.yaml b/locale/en/corteza-webapp-admin/admin.yaml
@@ -84,10 +84,10 @@ general:
   noAccess: You do not have permissions to access Admin panel
   pagination:
     next: Next
-    prev: Prev
-    showing: '{{from}} - {{to}} of {{count}} items'
-    single: One item
-    single_plural: '{{count}} items'
+    prev: Previous
+    showing: '{{from}} - {{to}} of {{count}} {{data}}'
+    single: 'One {{data}}'
+    single_plural: '{{count}} {{data}}'
 navigation:
   adminPanel: Admin panel
   automation: Automation

diff --git a/locale/en/corteza-webapp-admin/general.yaml b/locale/en/corteza-webapp-admin/general.yaml
@@ -1,4 +1,37 @@
 label:
+  template:
+    single: Template
+    plural: Templates
+  user:
+    single: User
+    plural: Users
+  role:
+    single: Role
+    plural: Roles
+  application:
+    single: Application
+    plural: Applications
+  auth_client:
+    single: Auth Client
+    plural: Auth Clients
+  queue:
+    single: Messaging Queue
+    plural: Messaging Queues
+  route:
+    single: Route
+    plural: Routes
+  connection:
+    single: Database Connection
+    plural: Database Connections
+  sensitivity_level:
+    single: Sensitivity Level
+    plural: Sensitivity Levels
+  session:
+    single: Session
+    plural: Sessions
+  workflow:
+    single: Workflow
+    plural: Workflows
   plus-add: + Add
   clear: Clear
   none: None

diff --git a/locale/en/corteza-webapp-compose/general.yaml b/locale/en/corteza-webapp-compose/general.yaml
@@ -39,7 +39,6 @@ label:
   importPlaceholder: Upload files to import
   loading: Loading
   makeDefault: Make default
-  module: Module
   moduleName: Module name
   multi: Multi
   name: Name
@@ -80,6 +79,15 @@ label:
   validation: Validation
   view: View
   yes: Yes
+  chart:
+    single: Chart
+    plural: Charts
+  namespace:
+    single: Namespace
+    plural: Namespaces
+  module: 
+    single: Module
+    plural: Modules
 navigation:
   chart: Charts
   namespace: Namespaces
@@ -148,9 +156,9 @@ resourceList:
   pagination:
     next: Next
     prev: Previous
-    showing: '{{from}} - {{to}} of {{count}} items'
-    single: One item
-    single_plural: '{{count}} items'
+    showing: '{{from}} - {{to}} of {{count}} {{data}}'
+    single: 'One {{data}}'
+    single_plural: '{{count}} {{data}}'
 recordNavigation:
   next: Next record
   prev: Previous record

diff --git a/locale/en/corteza-webapp-privacy/general.yaml b/locale/en/corteza-webapp-privacy/general.yaml
@@ -1,5 +1,11 @@
 label:
   back: Back
+  privacy_request:
+    single: Privacy Request
+    plural: Privacy Requests
+  sensitive_module:
+    single: Sensitive Module
+    plural: Sensitive Modules
 
 resourceList:
   loading: Loading
@@ -10,6 +16,6 @@ resourceList:
   pagination:
     next: Next
     prev: Previous
-    showing: '{{from}} - {{to}} of {{count}} items'
-    single: One item
-    single_plural: '{{count}} items'
+    showing: '{{from}} - {{to}} of {{count}} {{data}}'
+    single: 'One {{data}}'
+    single_plural: '{{count}} {{data}}'
diff --git a/locale/en/corteza-webapp-reporter/general.yaml b/locale/en/corteza-webapp-reporter/general.yaml
@@ -18,12 +18,16 @@ label:
   today: Today
   urlPlaceholder: https://example.tld
   default: Default
+  report: 
+    single: Report
+    plural: Reports
+
 resourceList:
   notFound: Not found
   noItems: No items to show
   pagination:
     next: Next
     prev: Previous
-    showing: '{{from}} - {{to}} of {{count}} items'
-    single: One item
-    single_plural: '{{count}} items'
+    showing: '{{from}} - {{to}} of {{count}} {{data}}'
+    single: 'One {{data}}'
+    single_plural: '{{count}} {{data}}'
diff --git a/locale/en/corteza-webapp-workflow/general.yaml b/locale/en/corteza-webapp-workflow/general.yaml
@@ -31,6 +31,9 @@ only: Only
 including: Including
 unnamed-workflow: Unnamed Workflow
 workflow-list: List of Workflows
+workflow:
+  single: Workflow
+  plural: Workflows
 save: Save
 today: Today
 cancel: Cancel
@@ -40,9 +43,9 @@ resourceList:
   pagination:
     next: Next
     prev: Previous
-    showing: '{{from}} - {{to}} of {{count}} items'
-    single: One item
-    single_plural: '{{count}} items'
+    showing: '{{from}} - {{to}} of {{count}} {{data}}'
+    single: 'One {{data}}'
+    single_plural: '{{count}} {{data}}'
 
 tooltip:
   permissions: Workflow permissions