diff --git a/examples/webpack-demo-vanilla-bundle/assets/i18n/en.json b/examples/webpack-demo-vanilla-bundle/assets/i18n/en.json index d55990333..bff4917cf 100644 --- 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}}" -} +} \ No newline at end of file diff --git a/examples/webpack-demo-vanilla-bundle/assets/i18n/fr.json b/examples/webpack-demo-vanilla-bundle/assets/i18n/fr.json index 886add9db..e02cdab89 100644 --- 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}}" -} +} \ No newline at end of file diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts index 0a5c4e2c8..599612327 100644 --- 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 index 9f02cb3f3..37ed7f794 100644 --- 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,7 +116,6 @@ 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, @@ -127,7 +123,7 @@ export const GlobalGridOptions: GridOption = { 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 index 2dfe54f1d..88d026297 100644 --- 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 index 29aab26c9..37d55b1b2 100644 Binary files a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip and b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip differ diff --git a/packages/vanilla-bundle/src/salesforce-global-grid-options.ts b/packages/vanilla-bundle/src/salesforce-global-grid-options.ts index b1d3cb7d3..8df42d9fb 100644 --- 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,