jsxgrid 2.1.0 → 2.2.0

package/src/i18n/pl.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "Dodaj",
                 updateButtonTooltip: "Aktualizuj",
                 cancelEditButtonTooltip: "Anuluj edytowanie"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "Wyszukiwanie",
+                insertModeButtonTooltip: "Dodawanie",
+                editButtonTooltip: "Edytuj",
+                deleteButtonTooltip: "Usuń",
+                searchButtonTooltip: "Szukaj",
+                clearFilterButtonTooltip: "Wyczyść filtr",
+                insertButtonTooltip: "Dodaj",
+                updateButtonTooltip: "Aktualizuj",
+                cancelEditButtonTooltip: "Anuluj edytowanie"
+            },
+            XimgField: {
+                editButtonText: "Otwórz menedżera plików"
+            },
+            Xjsoneditor: {
+                editText: "Edytor",
+                closeText: "Zapisz"
             }
         },
 

package/src/i18n/pt-br.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "Adicionar",
                 updateButtonTooltip: "Atualizar",
                 cancelEditButtonTooltip: "Cancelar Edição"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "Mudar para busca",
+                insertModeButtonTooltip: "Mudar para inserção",
+                editButtonTooltip: "Editar",
+                deleteButtonTooltip: "Remover",
+                searchButtonTooltip: "Buscar",
+                clearFilterButtonTooltip: "Remover filtro",
+                insertButtonTooltip: "Adicionar",
+                updateButtonTooltip: "Atualizar",
+                cancelEditButtonTooltip: "Cancelar Edição"
+            },
+            XimgField: {
+                editButtonText: "Abrir gerenciador de arquivos"
+            },
+            Xjsoneditor: {
+                editText: "Editor",
+                closeText: "Salvar"
             }
         },
 

package/src/i18n/pt.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "Adicionar",
                 updateButtonTooltip: "Atualizar",
                 cancelEditButtonTooltip: "Cancelar Edição"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "Mudar para busca",
+                insertModeButtonTooltip: "Mudar para inserção",
+                editButtonTooltip: "Editar",
+                deleteButtonTooltip: "Remover",
+                searchButtonTooltip: "Buscar",
+                clearFilterButtonTooltip: "Remover filtro",
+                insertButtonTooltip: "Adicionar",
+                updateButtonTooltip: "Atualizar",
+                cancelEditButtonTooltip: "Cancelar Edição"
+            },
+            XimgField: {
+                editButtonText: "Abrir gestor de ficheiros"
+            },
+            Xjsoneditor: {
+                editText: "Editor",
+                closeText: "Guardar"
             }
         },
 

package/src/i18n/ru.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "Добавить",
                 updateButtonTooltip: "Сохранить",
                 cancelEditButtonTooltip: "Отменить"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "Поиск",
+                insertModeButtonTooltip: "Добавить запись",
+                editButtonTooltip: "Изменить",
+                deleteButtonTooltip: "Удалить",
+                searchButtonTooltip: "Найти",
+                clearFilterButtonTooltip: "Очистить фильтр",
+                insertButtonTooltip: "Добавить",
+                updateButtonTooltip: "Сохранить",
+                cancelEditButtonTooltip: "Отменить"
+            },
+            XimgField: {
+                editButtonText: "Открыть менеджер файлов"
+            },
+            Xjsoneditor: {
+                editText: "Редактор",
+                closeText: "Сохранить"
             }
         },
 

package/src/i18n/tr.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "Ekle",
                 updateButtonTooltip: "Güncelle",
                 cancelEditButtonTooltip: "Güncelleme iptali"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "Arama moduna geç",
+                insertModeButtonTooltip: "Yeni kayıt moduna geç",
+                editButtonTooltip: "Değiştir",
+                deleteButtonTooltip: "Sil",
+                searchButtonTooltip: "Bul",
+                clearFilterButtonTooltip: "Filtreyi temizle",
+                insertButtonTooltip: "Ekle",
+                updateButtonTooltip: "Güncelle",
+                cancelEditButtonTooltip: "Güncelleme iptali"
+            },
+            XimgField: {
+                editButtonText: "Dosya yöneticisini aç"
+            },
+            Xjsoneditor: {
+                editText: "Düzenleyici",
+                closeText: "Kaydet"
             }
         },
 

package/src/i18n/zh-cn.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "插入",
                 updateButtonTooltip: "更新",
                 cancelEditButtonTooltip: "取消编辑"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "切换为搜索",
+                insertModeButtonTooltip: "切换为新增",
+                editButtonTooltip: "编辑",
+                deleteButtonTooltip: "删除",
+                searchButtonTooltip: "搜索",
+                clearFilterButtonTooltip: "清空过滤",
+                insertButtonTooltip: "插入",
+                updateButtonTooltip: "更新",
+                cancelEditButtonTooltip: "取消编辑"
+            },
+            XimgField: {
+                editButtonText: "打开文件管理器"
+            },
+            Xjsoneditor: {
+                editText: "编辑器",
+                closeText: "保存"
             }
         },
 

package/src/i18n/zh-tw.js

@@ -28,6 +28,24 @@
                 insertButtonTooltip: "新增",
                 updateButtonTooltip: "修改",
                 cancelEditButtonTooltip: "取消編輯"
+            },
+            Xcontrol: {
+                searchModeButtonTooltip: "切換為搜尋",
+                insertModeButtonTooltip: "切換為新增",
+                editButtonTooltip: "編輯",
+                deleteButtonTooltip: "刪除",
+                searchButtonTooltip: "搜尋",
+                clearFilterButtonTooltip: "清除搜尋條件",
+                insertButtonTooltip: "新增",
+                updateButtonTooltip: "修改",
+                cancelEditButtonTooltip: "取消編輯"
+            },
+            XimgField: {
+                editButtonText: "開啟檔案總管"
+            },
+            Xjsoneditor: {
+                editText: "編輯器",
+                closeText: "儲存"
             }
         },
 

package/src/jsgrid.core.js

@@ -83,6 +83,14 @@
         height: "auto",
         updateOnResize: true,
 
+        // Per-instance locale: a key from jsGrid.locales (e.g. "ru"), or an
+        // inline locale config object with the same {grid, fields} shape.
+        // Applied once at construction time, before the rest of `config` -
+        // any option the caller also sets explicitly still wins. Unlike
+        // jsGrid.locale(), this never touches shared prototypes, so two
+        // grids on the same page can run in different languages at once.
+        locale: null,
+
         rowClass: $.noop,
         rowRenderer: null,
 
@@ -196,6 +204,7 @@
         gridBodyClass: "jsgrid-grid-body",
 
         _init: function(config) {
+            this._initInstanceLocale(config && config.locale);
             $.extend(this, config);
             this._initLoadStrategy();
             this._initController();
@@ -205,6 +214,24 @@
             this._callEventHandler(this.onInit)
         },
 
+        _initInstanceLocale: function(locale) {
+            if(!locale) {
+                return;
+            }
+
+            var localeConfig = $.isPlainObject(locale) ? locale : jsGrid.locales[locale];
+            if(!localeConfig) {
+                return;
+            }
+
+            if(localeConfig.grid) {
+                $.extend(this, localeConfig.grid);
+            }
+
+            this._fieldsLocaleConfig = localeConfig.fields;
+            this._validatorsLocaleConfig = localeConfig.validators;
+        },
+
         loadStrategy: function() {
             return this.pageLoading
                 ? new jsGrid.loadStrategies.PageLoadingStrategy(this)
@@ -241,9 +268,15 @@
 
         _initFields: function() {
             var self = this;
+            var fieldsLocale = self._fieldsLocaleConfig;
             self.fields = $.map(self.fields, function(field) {
                 if($.isPlainObject(field)) {
                     var fieldConstructor = (field.type && jsGrid.fields[field.type]) || jsGrid.Field;
+                    var fieldLocale = fieldsLocale && field.type && fieldsLocale[field.type];
+                    if(fieldLocale) {
+                        // locale strings are defaults; explicit keys on the field config still win
+                        field = $.extend({}, fieldLocale, field);
+                    }
                     field = new fieldConstructor(field);
                 }
                 field._grid = self;
@@ -415,7 +448,9 @@
         },
 
         _createValidation: function() {
-            return getOrApply(this.validation, this);
+            return getOrApply(this.validation, this, {
+                validatorsLocale: this._validatorsLocaleConfig
+            });
         },
 
         _clear: function() {
@@ -1629,6 +1664,13 @@
     };
 
     var setLocale = function(obj, localeConfig) {
+        if(!obj) {
+            // target not loaded on the page (e.g. a locale file's fields.control
+            // section with no native control.js loaded) - skip this branch
+            // instead of throwing and aborting the rest of the locale.
+            return;
+        }
+
         $.each(localeConfig, function(field, value) {
             if($.isPlainObject(value)) {
                 setLocale(obj[field] || obj[field[0].toUpperCase() + field.slice(1)], value);
@@ -1637,7 +1679,7 @@
 
             if(obj.hasOwnProperty(field)) {
                 obj[field] = value;
-            } else {
+            } else if(obj.prototype) {
                 obj.prototype[field] = value;
             }
         });

package/src/jsgrid.validation.js

@@ -62,7 +62,12 @@
                 validator = { validator: validator };
             }
 
-            return $.extend({}, validator, rule);
+            // this grid's own locale (jsGrid's `locale` init option), if any,
+            // overrides the shared default message but still loses to a message
+            // set explicitly on the rule itself
+            var localeOverride = this.validatorsLocale && this.validatorsLocale[validatorName];
+
+            return $.extend({}, validator, localeOverride, rule);
         }
     };