fix(locales): add missing text & remove global config texts fix Locales

- we shouldn't provide text in global config, we should instead provide a Key so that it doesn't conflict with Locales (TEXT_...) because if a text is provided it won't automatically go to Locales when it really should (the Footer wasn't using the Locales properly for that reason)
ghiscoding · Nov 24, 2021 · 655a872 · 655a872
1 parent 0c1b9e4
commit 655a872
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/examples/webpack-demo-vanilla-bundle/assets/i18n/en.json b/examples/webpack-demo-vanilla-bundle/assets/i18n/en.json
@@ -47,6 +47,7 @@
   "OK": "OK",
   "PAGE": "Page",
   "PAGE_X_OF_Y": "page {{x}} of {{y}}",
+  "RECORDS_SELECTED": "records selected",
   "REFRESH_DATASET": "Refresh Dataset",
   "REMOVE_FILTER": "Remove Filter",
   "REMOVE_SORT": "Remove Sort",
@@ -98,4 +99,4 @@
   "TITLE": "Title",
   "TRUE": "True",
   "X_DAY_PLURAL": "{{x}} day{{plural}}"
-}
+}
diff --git a/examples/webpack-demo-vanilla-bundle/assets/i18n/fr.json b/examples/webpack-demo-vanilla-bundle/assets/i18n/fr.json
@@ -47,6 +47,7 @@
   "OK": "Terminé",
   "PAGE": "Page",
   "PAGE_X_OF_Y": "page {{x}} de {{y}}",
+  "RECORDS_SELECTED": "enregistrements sélectionnés",
   "REFRESH_DATASET": "Rafraîchir les données",
   "REMOVE_FILTER": "Supprimer le filtre",
   "REMOVE_SORT": "Supprimer le tri",
@@ -99,4 +100,4 @@
   "TITLE.NAME": "Nom du Titre",
   "TRUE": "Vrai",
   "X_DAY_PLURAL": "{{x}} journée{{plural}}"
-}
+}
diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts
@@ -51,6 +51,7 @@ export class Constants {
     TEXT_NOT_CONTAINS: 'Not contains',
     TEXT_NOT_EQUAL_TO: 'Not equal to',
     TEXT_PAGE: 'Page',
+    TEXT_RECORDS_SELECTED: 'records selected',
     TEXT_REFRESH_DATASET: 'Refresh Dataset',
     TEXT_REMOVE_FILTER: 'Remove Filter',
     TEXT_REMOVE_SORT: 'Remove Sort',

diff --git a/packages/common/src/global-grid-options.ts b/packages/common/src/global-grid-options.ts
@@ -1,5 +1,5 @@
 import { DelimiterType, EventNamingStyle, FileType, GridAutosizeColsMode, OperatorType } from './enums/index';
-import { Column, GridOption, TreeDataOption } from './interfaces/index';
+import { Column, EmptyWarning, GridOption, TreeDataOption } from './interfaces/index';
 import { Filters } from './filters';
 
 /** Global Grid Options Defaults */
@@ -83,11 +83,8 @@ export const GlobalGridOptions: GridOption = {
     rightContainerClass: 'col-xs-6 col-sm-7',
     metricSeparator: '|',
     metricTexts: {
-      items: 'items',
       itemsKey: 'ITEMS',
-      of: 'of',
       ofKey: 'OF',
-      itemsSelected: 'items selected',
       itemsSelectedKey: 'ITEMS_SELECTED'
     }
   },
@@ -119,15 +116,14 @@ export const GlobalGridOptions: GridOption = {
   enableEmptyDataWarningMessage: true,
   emptyDataWarning: {
     className: 'slick-empty-data-warning',
-    message: 'No data to display.',
     messageKey: 'EMPTY_DATA_WARNING_MESSAGE',
     hideFrozenLeftWarning: false,
     hideFrozenRightWarning: false,
     leftViewportMarginLeft: '40%',
     rightViewportMarginLeft: '40%',
     frozenLeftViewportMarginLeft: '0px',
     frozenRightViewportMarginLeft: '40%',
-  },
+  } as unknown as EmptyWarning,
   enableAutoResize: true,
   enableAutoSizeColumns: true,
   enableCellNavigation: false,

diff --git a/packages/common/src/interfaces/locale.interface.ts b/packages/common/src/interfaces/locale.interface.ts
@@ -146,6 +146,9 @@ export interface Locale {
   /** Text "Page" displayed in the Pagination (when enabled) */
   TEXT_PAGE?: string;
 
+  /** Text "records selected" optionally shown in the Footer (when enabled) */
+  TEXT_RECORDS_SELECTED?: string;
+
   /** Text "Refresh Dataset" displayed in the Grid Menu (when enabled) */
   TEXT_REFRESH_DATASET?: string;
 

diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip
diff --git a/packages/vanilla-bundle/src/salesforce-global-grid-options.ts b/packages/vanilla-bundle/src/salesforce-global-grid-options.ts
@@ -62,7 +62,7 @@ export const SalesforceGlobalGridOptions = {
     hideTotalItemCount: false,
     hideLastUpdateTimestamp: true,
     metricTexts: {
-      itemsSelected: 'records selected',
+      itemsSelectedKey: 'RECORDS_SELECTED',
     }
   },
   headerRowHeight: 35,