feat(translate): make ngx-translate optional in all necessary Editors

ghiscoding · Jul 22, 2019 · 5eb1ec1 · 5eb1ec1
1 parent 86b1214
commit 5eb1ec1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/app/modules/angular-slickgrid/editors/dateEditor.ts b/src/app/modules/angular-slickgrid/editors/dateEditor.ts
@@ -88,10 +88,9 @@ export class DateEditor implements Editor {
 
   getCurrentLocale(columnDef: Column, gridOptions: GridOption) {
     const options = gridOptions || columnDef.params || {};
-    if (options.i18n && options.i18n instanceof TranslateService) {
+    if (options && options.i18n instanceof TranslateService) {
       return options.i18n.currentLang;
     }
-
     return 'en';
   }
 

diff --git a/src/app/modules/angular-slickgrid/editors/longTextEditor.ts b/src/app/modules/angular-slickgrid/editors/longTextEditor.ts
@@ -33,7 +33,9 @@ export class LongTextEditor implements Editor {
   constructor(private args: any) {
     this.gridOptions = this.args.grid.getOptions() as GridOption;
     const options = this.gridOptions || this.args.column.params || {};
-    this._translate = options.i18n;
+    if (options && options.i18n instanceof TranslateService) {
+      this._translate = options.i18n;
+    }
 
     this.init();
   }
@@ -61,8 +63,8 @@ export class LongTextEditor implements Editor {
     const columnId = this.columnDef && this.columnDef.id;
     const placeholder = this.columnEditor && this.columnEditor.placeholder || '';
     const title = this.columnEditor && this.columnEditor.title || '';
-    const cancelText = this._translate && this._translate.instant('CANCEL') || Constants.TEXT_CANCEL;
-    const saveText = this._translate && this._translate.instant('SAVE') || Constants.TEXT_SAVE;
+    const cancelText = this._translate && this._translate.instant && this._translate.instant('CANCEL') || Constants.TEXT_CANCEL;
+    const saveText = this._translate && this._translate.instant && this._translate.instant('SAVE') || Constants.TEXT_SAVE;
     const $container = $('body');
 
     this.$wrapper = $(`<div class="slick-large-editor-text editor-${columnId}" />`).appendTo($container);

diff --git a/src/app/modules/angular-slickgrid/editors/selectEditor.ts b/src/app/modules/angular-slickgrid/editors/selectEditor.ts
@@ -77,8 +77,10 @@ export class SelectEditor implements Editor {
 
   constructor(protected args: any, protected isMultipleSelect) {
     this.gridOptions = this.args.grid.getOptions() as GridOption;
-    const gridOptions = this.gridOptions || this.args.column.params || {};
-    this._translate = gridOptions.i18n;
+    const options = this.gridOptions || this.args.column.params || {};
+    if (options && options.i18n instanceof TranslateService) {
+      this._translate = options.i18n;
+    }
 
     // provide the name attribute to the DOM element which will be needed to auto-adjust drop position (dropup / dropdown)
     const fieldId = this.columnDef && this.columnDef.id;