\
\
+ {{t.map_mapping}}: \
\
+ {{t.map_mapping_lat_lon}} \
\
+ {{t.map_mapping_geojson}} \
\
\
-
\
+
\
\
\
\
-
\
+
\
\
\
\
\
-
\
+
\
\
\
\
\
- \
+ \
\
\
\
+ {{t.Auto_zoom_to_features}} \
\
+ {{t.Cluster_markers}} \
\
\
\
@@ -582,6 +584,7 @@ my.MapMenu = Backbone.I18nView.extend({
this.listenTo(this.model.fields, 'change', this.render);
this.state = new recline.Model.ObjectState(options.state);
this.listenTo(this.state, 'change', this.render);
+ this.initializeI18n(options.locale);
this.render();
},
diff --git a/src/view.multiview.js b/src/view.multiview.js
index 34255462..ce2cb8ab 100644
--- a/src/view.multiview.js
+++ b/src/view.multiview.js
@@ -132,7 +132,7 @@ my.MultiView = Backbone.I18nView.extend({
var self = this;
this._setupState(options.state);
// todo any better idea to pass locale than by initialization? singleton? or does Intl API handle that?
- this.initializeI18n(options.locale || 'en');
+ this.initializeI18n(options.locale);
// Hash of 'page' views (i.e. those for whole page) keyed by page name
if (options.views) {
@@ -176,13 +176,15 @@ my.MultiView = Backbone.I18nView.extend({
id: 'filterEditor',
label: this.t('Filters'),
view: new my.FilterEditor({
- model: this.model
+ model: this.model,
+ locale: this.locale
})
}, {
id: 'fieldsView',
label: this.t('Fields'),
view: new my.Fields({
- model: this.model
+ model: this.model,
+ locale: this.locale
})
}];
}
@@ -271,7 +273,8 @@ my.MultiView = Backbone.I18nView.extend({
this.$el.find('.recline-results-info').after(this.pager.el);
this.queryEditor = new recline.View.QueryEditor({
- model: this.model.queryState
+ model: this.model.queryState,
+ locale: this.locale
});
this.$el.find('.query-editor-here').append(this.queryEditor.el);
diff --git a/src/view.slickgrid.js b/src/view.slickgrid.js
index 938dd241..24997dda 100644
--- a/src/view.slickgrid.js
+++ b/src/view.slickgrid.js
@@ -44,10 +44,12 @@ my.SlickGrid = Backbone.I18nView.extend({
initialize: function(modelEtc) {
var self = this;
this.$el.addClass('recline-slickgrid');
+ this.initializeI18n(modelEtc.locale);
// Template for row delete menu , change it if you don't love
this.templates = {
- "deleterow" : '
'
+ deleterow : '
',
+ reorderrows: '
{{t.Reorder_row}}
'
};
_.bindAll(this, 'render', 'onRecordChanged');
@@ -71,7 +73,7 @@ my.SlickGrid = Backbone.I18nView.extend({
if(this.state.get("gridOptions")
&& this.state.get("gridOptions").enabledAddRow != undefined
&& this.state.get("gridOptions").enabledAddRow == true ){
- this.editor = new my.GridControl()
+ this.editor = new my.GridControl({locale: this.locale})
this.elSidebar = this.editor.$el
this.listenTo(this.editor.state, 'change', function(){
this.model.records.add(new recline.Model.Record())
@@ -109,8 +111,14 @@ my.SlickGrid = Backbone.I18nView.extend({
// row = row index, cell = cell index, value = value, columnDef = column definition, dataContext = full row values
var formatter = function(row, cell, value, columnDef, dataContext) {
if(columnDef.id == "del"){
- return self.templates.deleterow
+ var formatted = Mustache.render(self.templates.deleterow, _.extend({}, self.MustacheFormatter()));
+ return formatted;
}
+ if(columnDef.id == "#"){
+ var formatted = Mustache.render(self.templates.reorderrows, _.extend({}, self.MustacheFormatter()));
+ return formatted;
+ }
+
var field = self.model.fields.get(columnDef.id);
if (field.renderer) {
return field.renderer(value, field, dataContext);
@@ -145,7 +153,8 @@ my.SlickGrid = Backbone.I18nView.extend({
behavior: "selectAndMove",
selectable: false,
resizable: false,
- cssClass: "recline-cell-reorder"
+ cssClass: "recline-cell-reorder",
+ formatter: formatter
})
}
// Add column for row delete support
@@ -434,21 +443,25 @@ my.SlickGrid = Backbone.I18nView.extend({
// Add new grid Control to display a new row add menu bouton
// It display a simple side-bar menu ,for user to add new
// row to grid
-my.GridControl= Backbone.View.extend({
+my.GridControl= Backbone.I18nView.extend({
className: "recline-row-add",
// Template for row edit menu , change it if you don't love
template: '
',
- initialize: function(options){
+ initialize: function(options = {}){
var self = this;
_.bindAll(this, 'render');
this.state = new recline.Model.ObjectState();
+ this.initializeI18n(options.locale);
+
this.render();
},
render: function() {
var self = this;
- this.$el.html(this.template)
+
+ var formatted = Mustache.render(this.template, _.extend({}, this.MustacheFormatter()));
+ this.$el.html(formatted);
},
events : {
diff --git a/src/widget.fields.js b/src/widget.fields.js
index b1d0f70f..4758c927 100644
--- a/src/widget.fields.js
+++ b/src/widget.fields.js
@@ -75,6 +75,8 @@ my.Fields = Backbone.I18nView.extend({
self.render();
});
this.$el.find('.collapse').collapse();
+ this.initializeI18n(model.locale);
+
this.render();
},
render: function() {
diff --git a/src/widget.filtereditor.js b/src/widget.filtereditor.js
index a37fd7b0..4f4a4ebe 100644
--- a/src/widget.filtereditor.js
+++ b/src/widget.filtereditor.js
@@ -58,7 +58,7 @@ my.FilterEditor = Backbone.I18nView.extend({