gridx-rails 1.2.1 → 1.3.0.pre.alpha

data/app/assets/javascripts/gridx/nls/zh/{FilterBar.js → gridx.js}

@@ -1,5 +1,14 @@
-define({      
-//begin v1.x content
+define({
+//Body
+	loadingInfo: "正在加载...",
+	emptyInfo: "没有要显示的项",
+	loadFailInfo: "加载数据失败！",
+	loadMore: "加载更多",
+	loadMoreLoading: "正在加载...",
+	loadPrevious: "加载上一页",
+	loadPreviousLoading: "正在加载...",
+
+//FilterBar
 	"clearFilterDialogTitle": "清除过滤器",
 	"filterDefDialogTitle": "过滤器",
 	"defaultRuleTitle": "规则 ",
@@ -83,7 +92,70 @@ define({
 	"endTimeRangeLabel": "时间范围值终点",
 	"beginDateRangeLabel": "日期范围值起点",
 	"endDateRangeLabel": "日期范围值终点",
-	"startsWithExpr": "${0}*"
-//end v1.x content
-});
+	"startsWithExpr": "${0}*",
+
+//NestedSort
+	singleSort: "单层排序",
+	nestedSort: "嵌套排序",
+	ascending: "单击以按“升序”排序",
+	descending: "单击以按“降序”排序",
+	sortingState: "${0} - ${1}",
+	unsorted: "请勿对此列进行排序",
+	waiSingleSortLabel: "${0} - 已按 ${1} 排序。请选择按 ${2} 排序",
+	waiNestedSortLabel:"${0} - 已按 ${1} 嵌套排序。请选择按 ${2} 嵌套排序",
+
+//PaginationBar
+	pagerWai: '调页程序',
+
+	pageIndex: '${0}',
+	pageIndexTitle: '第 ${0} 页',
+
+	firstPageTitle: '第一页',
+	prevPageTitle: '上一页',
+	nextPageTitle: '下一页',
+	lastPageTitle: '最后一页',
+
+	pageSize: '${0}',
+	pageSizeTitle: '每页 ${0} 项',
+	pageSizeAll: '所有',
+	pageSizeAllTitle: '所有项',
+
+	description: '第 ${0} - ${2} 项（共 ${1} 项）。',
+	descriptionEmpty: '网格为空。',
 
+	summary: '总计：${0}',
+	summaryWithSelection: '总计：${0} 已选择：${1}',
+
+	gotoBtnTitle: '转到特定页面',
+
+	gotoDialogTitle: '转到页面',
+	gotoDialogMainMsg: '指定页码：',
+	gotoDialogPageCount: ' （${0} 页）',
+	gotoDialogOKBtn: '确定',
+	gotoDialogCancelBtn: '取消',
+	// for drop down pagination bar
+	pageLabel: '页面',
+	pageSizeLabel: '行',
+
+//QuickFilter
+	filterLabel: '过滤器',
+	clearButtonTitle: '清除过滤器',
+	buildFilterMenuLabel: '构建过滤器…',
+	apply: '应用过滤器',
+
+//Sort
+	helpMsg: '${0} - 单击以排序，或者按 Ctrl 键并单击以添加到排序项',
+	singleHelpMsg: '${0} - 单击以排序',
+	priorityOrder: '排序优先级 ${0}',
+
+//SummaryBar
+	summaryTotal: '总计：${0}',
+	summarySelected: '已选择：${0}',
+	summaryRange: 'Range: ${0}-${1}',	//need translation
+
+//Other
+	indirectSelectAll: "Press SPACE to select all.",	//need translation
+	indirectDeselectAll: "Press SPACE to deselect all.",	//need translation
+	treeExpanded: "Control + left arrow key to collapse this row.",	//need translation
+	treeCollapsed: "Control + right arrow key to expand this row."	//need translation
+});

data/app/assets/javascripts/gridx/nls/zh-tw/{FilterBar.js → gridx.js}

@@ -1,5 +1,14 @@
-define({      
-//begin v1.x content
+define({
+//Body
+	loadingInfo: "正在載入...",
+	emptyInfo: "無顯示項目",
+	loadFailInfo: "無法載入資料！",
+	loadMore: "載入其他",
+	loadMoreLoading: "正在載入...",
+	loadPrevious: "載入前一個",
+	loadPreviousLoading: "正在載入...",
+
+//FilterBar
 	"clearFilterDialogTitle": "清除過濾器",
 	"filterDefDialogTitle": "過濾器",
 	"defaultRuleTitle": "規則",
@@ -83,7 +92,70 @@ define({
 	"endTimeRangeLabel": "時間範圍值結束",
 	"beginDateRangeLabel": "日期範圍值開始",
 	"endDateRangeLabel": "日期範圍值結束",
-	"startsWithExpr": "${0}*"
-//end v1.x content
-});
+	"startsWithExpr": "${0}*",
+
+//NestedSort
+	singleSort: "單一排序",
+	nestedSort: "巢狀排序",
+	ascending: "按一下以進行遞增排序",
+	descending: "按一下以進行遞減排序",
+	sortingState: "${0} - ${1}",
+	unsorted: "請勿對此欄執行排序",
+	waiSingleSortLabel: "${0} - 依 ${1} 排序。選擇以依 ${2} 排序",
+	waiNestedSortLabel:"${0} - 依 ${1} 巢狀排序。選擇以依 ${2} 巢狀排序",
+
+//PaginationBar
+	pagerWai: '分頁器',
+
+	pageIndex: '${0}',
+	pageIndexTitle: '頁面 ${0}',
+
+	firstPageTitle: '首頁',
+	prevPageTitle: '上一頁',
+	nextPageTitle: '下一頁',
+	lastPageTitle: '末頁',
+
+	pageSize: '${0}',
+	pageSizeTitle: '每頁 ${0} 個項目',
+	pageSizeAll: '所有',
+	pageSizeAllTitle: '所有項目',
+
+	description: '${0} - ${1} 個項目（共 ${2} 個項目）。',
+	descriptionEmpty: '網格是空的。',
 
+	summary: '總計：${0}',
+	summaryWithSelection: '總計：${0} 已選取：${1}',
+
+	gotoBtnTitle: '跳至特定的頁面',
+
+	gotoDialogTitle: '跳至頁面',
+	gotoDialogMainMsg: '指定頁碼：',
+	gotoDialogPageCount: ' （${0} 頁）',
+	gotoDialogOKBtn: '執行',
+	gotoDialogCancelBtn: '取消',
+	// for drop down pagination bar
+	pageLabel: '頁面',
+	pageSizeLabel: '列',
+
+//QuickFilter
+	filterLabel: '過濾器',
+	clearButtonTitle: '清除過濾器',
+	buildFilterMenuLabel: '建置過濾器…',
+	apply: '套用過濾器',
+
+//Sort
+	helpMsg: '${0} - 按一下以進行排序，或按住 Ctrl 同時用滑鼠按一下以新增至排序',
+	singleHelpMsg: '${0} - 按一下以進行排序',
+	priorityOrder: '排序優先順序 ${0} ',
+
+//SummaryBar
+	summaryTotal: '總計：${0}',
+	summarySelected: '已選取：${0}',
+	summaryRange: 'Range: ${0}-${1}',	//need translation
+
+//Other
+	indirectSelectAll: "Press SPACE to select all.",	//need translation
+	indirectDeselectAll: "Press SPACE to deselect all.",	//need translation
+	treeExpanded: "Control + left arrow key to collapse this row.",	//need translation
+	treeCollapsed: "Control + right arrow key to expand this row."	//need translation
+});

data/app/assets/javascripts/gridx/nls/zz-ZZ/gridx.js

@@ -0,0 +1,173 @@
+define(
+({
+//Body
+	loadingInfo: "[G'Ｌｏａding...İı｜]",
+	emptyInfo: "[G'Ｎｏ ｉｔｅｍｓ ｔo displayİı｜]",
+	loadFailInfo: "[G'Ｆａｉｌｅｄ ｔｏ ｌoad data!İı｜]",
+	loadMore: "[G'Ｌｏad Moreİı｜]",
+	loadMoreLoading: "[G'Ｌｏａding...İı｜]",
+	loadPrevious: "[G'Ｌｏａｄ Ｐreviousİı｜]",
+	loadPreviousLoading: "[G'Ｌｏａding...İı｜]",
+	indirectSelectAll: "[G'Ｐｒｅｓｓ ＳＰＡＣＥ ｔo select all.İı｜]",
+	indirectDeselectAll: "[G'Ｐｒｅｓｓ ＳＰＡＣＥ ｔo deselect all.İı｜]",
+	treeExpanded: "[G'Ｃｏｎｔｒｏｌ + ｌｅｆｔ ａｒrow key to collapse this row.İı｜]",
+	treeCollapsed: "[G'Ｃｏｎｔｒｏｌ + ｒｉｇｈｔ ａrrow key to expand this row.İı｜]",
+
+//FilterBar
+	"clearFilterDialogTitle": "[G'Ｃｌｅａr Filterİı｜]",
+	"filterDefDialogTitle": "[G'Filterİı｜]",
+	"defaultRuleTitle": "[G'Ruleİı｜]",
+	"ruleTitleTemplate": "[G'Rule [${ruleNumber}]İı｜]",
+	"noFilterApplied": "[G'Ｎｏ ｆｉｌｔｅｒ applied.İı｜]",
+	"defineFilter": "[G'Ｄｅｆｉｎe filterİı｜]",
+	
+	"conditionEqual": "[G'equalİı｜]",
+	"conditionNotEqual": "[G'ｄｏｅｓ ｎｏt equalİı｜]",
+	"conditionLess": "[G'ｉｓ ｌｅss thanİı｜]",
+	"conditionLessEqual": "[G'ｌｅｓｓ ｔｈａｎ or equalİı｜]",
+	"conditionGreater": "[G'ｉｓ ｇｒｅａter thanİı｜]",
+	"conditionGreaterEqual": "[G'ｇｒｅａｔｅｒ ｔｈan or equalİı｜]",
+	"conditionContain": "[G'ｃontainsİı｜]",
+	"conditionIs": "[G'isİı｜]",
+	"conditionStartWith": "[G'ｓｔａｒts withİı｜]",
+	"conditionEndWith": "[G'ｅｎds withİı｜]",
+	"conditionNotContain": "[G'ｄｏｅｓ ｎｏｔ containİı｜]",
+	"conditionIsNot": "[G'is notİı｜]",
+	"conditionNotStartWith": "[G'ｄｏｅｓ ｎｏｔ ｓtart withİı｜]",
+	"conditionNotEndWith": "[G'ｄｏｅｓ ｎｏｔ end withİı｜]",
+	"conditionBefore": "[G'beforeİı｜]",
+	"conditionAfter": "[G'afterİı｜]",
+	"conditionRange": "[G'rangeİı｜]",
+	"conditionIsEmpty": "[G'ｉs emptyİı｜]",
+	
+	"all": "[G'allİı｜]",
+	"any": "[G'anyİı｜]",
+	"relationAll": "[G'ａｌl rulesİı｜]",
+	"waiRelAll": "[G'Ｍａｔｃｈ ａｌｌ ｏｆ ｔｈe following rules:İı｜]",
+	"relationAny": "[G'ａny ruleİı｜]",
+	"waiRelAny": "[G'Ｍａｔｃｈ ａｎｙ ｏｆ ｔｈe following rules:İı｜]",
+	"relationMsgFront": "[G'Matchİı｜]",
+	"relationMsgTail": "",
+	"and": "[G'andİı｜]",
+	"or": "[G'orİı｜]",
+	
+	"addRuleButton": "[G'Ａdd Ruleİı｜]",
+	"waiAddRuleButton": "[G'Ａｄｄ ａ ｎｅw ruleİı｜]",
+	"removeRuleButton": "[G'Ｒｅｍｏve Ruleİı｜]",
+	"waiRemoveRuleButtonTemplate": "[G'Ｒｅｍｏｖe rule [${0}]İı｜]",
+	
+	"addRuleButton": "[G'Ａｄｄ Ｆｉｌter Ruleİı｜]",
+	"cancelButton": "[G'Cancelİı｜]",
+	"waiCancelButton": "[G'Ｃａｎｃｅｌ ｔｈis dialogİı｜]",
+	"clearButton": "[G'Clearİı｜]",
+	"waiClearButton": "[G'Ｃｌｅａｒ ｔｈe filterİı｜]",
+	"filterButton": "[G'Filterİı｜]",
+	"waiFilterButton": "[G'Ｓｕｂｍｉｔ ｔhe filterİı｜]",
+	
+	"columnSelectLabel": "[G'Column:İı｜]",
+	"waiColumnSelectTemplate": "[G'Ｃｏｌｕｍｎ ｆor rule [${0}]İı｜]",
+	"conditionSelectLabel": "[G'Ｃｏｎdition:İı｜]",
+	"waiConditionSelectTemplate": "[G'Ｃｏｎｄｉｔｉｏｎ for rule [${0}]İı｜]",
+	"valueBoxLabel": "[G'Value:İı｜]",
+	"waiValueBoxTemplate": "[G'Ｅｎｔｅｒ ｖａｌｕｅ ｔo filter for rule [${0}]İı｜]",
+	
+	"rangeTo": "[G'toİı｜]",
+	"rangeTemplate": "[G'ｆｒｏｍ [${0}] to [${1}]İı｜]",
+	
+	"statusTipHeaderColumn": "[G'Columnİı｜]",
+	"statusTipHeaderCondition": "[G'Rulesİı｜]",
+	"statusTipTitle": "[G'Ｆｉｌter Barİı｜]",
+	"statusTipMsg": "[G'Ｃｌｉｃｋ ｔｈｅ ｆｉｌｔｅr bar here to filter on values in [${0}].İı｜]",
+	"anycolumn": "[G'ａｎｙ columnİı｜]",
+	"statusTipTitleNoFilter": "[G'Ｆｉｌter Barİı｜]",
+	"statusTipTitleHasFilter": "[G'Filterİı｜]",
+	"statusTipRelPre": "[G'Matchİı｜]",
+	"statusTipRelPost": "[G'rules.İı｜]",
+	"statusTipHeaderAll": "[G'Ｍａｔｃｈ ａｌl rules.İı｜]",
+	"statusTipHeaderAny": "[G'Ｍａｔｃｈ ａｎy rules.İı｜]",
+	
+	"defaultItemsName": "[G'itemsİı｜]",
+	"filterBarMsgHasFilterTemplate": "[G'[${0}] ｏｆ [${1}] [${2}] ｓｈｏｗn.İı｜]",
+	"filterBarMsgNoFilterTemplate": "[G'Ｎｏ ｆｉｌｔｅr appliedİı｜]",
+	
+	"filterBarDefButton": "[G'Ｄｅｆｉｎe filterİı｜]",
+	"waiFilterBarDefButton": "[G'Ｆｉｌｔｅｒ ｔhe tableİı｜]",
+	"a11yFilterBarDefButton": "[G'Ｆｉlter...İı｜]",
+	"filterBarClearButton": "[G'Ｃｌｅａr filterİı｜]",
+	"waiFilterBarClearButton": "[G'Ｃｌｅａｒ ｔｈe filterİı｜]",
+	"closeFilterBarBtn": "[G'Ｃｌｏｓｅ ｆｉlter barİı｜]",
+	
+	"clearFilterMsg": "[G'Ｔｈｉｓ ｗｉｌｌ ｒｅｍｏｖｅ the filter and show all available records.İı｜]",
+	"anyColumnOption": "[G'Ａｎｙ Columnİı｜]",
+	
+	"trueLabel": "[G'Trueİı｜]",
+	"falseLabel": "[G'Falseİı｜]",
+	"radioTrueLabel": "[G'Ｖａｌue Trueİı｜]",
+	"radioFalseLabel": "[G'Ｖａｌｕe Falseİı｜]",
+	"beginTimeRangeLabel": "[G'Ｔｉｍｅ Ｒａｎｇｅ Ｖalue Startİı｜]",
+	"endTimeRangeLabel": "[G'Ｔｉｍｅ Ｒａｎｇｅ Value Endİı｜]",
+	"beginDateRangeLabel": "[G'Ｄａｔｅ Ｒａｎｇｅ Ｖalue Startİı｜]",
+	"endDateRangeLabel": "[G'Ｄａｔｅ Ｒａｎｇｅ Value Endİı｜]",
+	"startsWithExpr": "[G'[${0}]*İı｜]",
+
+//NestedSort
+	singleSort: "[G'Ｓｉｎｇle Sortİı｜]",
+	nestedSort: "[G'Ｎｅｓｔed Sortİı｜]",
+	ascending: "[G'Ｃｌｉｃｋ ｔｏ ｓｏｒt Ascendingİı｜]",
+	descending: "[G'Ｃｌｉｃｋ ｔｏ ｓｏｒt Descendingİı｜]",
+	sortingState: "[G'[${0}] - [${1}]İı｜]",
+	unsorted: "[G'Ｄｏ ｎｏｔ ｓｏｒｔ ｔhis columnİı｜]",
+	
+	waiSingleSortLabel: "[G'[${0}] - ｉｓ ｓｏｒｔｅｄ ｂｙ [${1}]. Ｃｈｏose to sort by [${2}]İı｜]",
+	waiNestedSortLabel:"[G'[${0}] - ｉｓ ｎｅｓｔｅｄ ｓｏｒｔｅｄ by [${1}]. Choose to nested sort by [${2}]İı｜]",
+
+//PaginationBar
+	pagerWai: '[G\'Pagerİı｜]',
+
+	pageIndex: '[G\'[${0}]İı｜]',
+	pageIndexTitle: '[G\'Page [${0}]İı｜]',
+
+	firstPageTitle: '[G\'Ｆｉｒst pageİı｜]',
+	prevPageTitle: '[G\'Ｐｒｅｖｉous pageİı｜]',
+	nextPageTitle: '[G\'Ｎｅxt pageİı｜]',
+	lastPageTitle: '[G\'Ｌａst pageİı｜]',
+
+	pageSize: '[G\'[${0}]İı｜]',
+	pageSizeTitle: '[G\'[${0}] ｉｔｅｍｓ ｐｅr pageİı｜]',
+	pageSizeAll: '[G\'Allİı｜]',
+	pageSizeAllTitle: '[G\'Ａｌl itemsİı｜]',
+
+	description: '[G\'[${0}] - [${1}] ｏｆ [${2}] ｉｔｅｍｓ.İı｜]',
+	descriptionEmpty: '[G\'Ｇｒｉｄ ｉｓ empty.İı｜]',
+
+	summary: '[G\'Ｔotal: [${0}]İı｜]',
+	summaryWithSelection: '[G\'Ｔｏｔａｌ: [${0}] Ｓｅｌｅcted: [${1}]İı｜]',
+
+	gotoBtnTitle: '[G\'Ｇｏ ｔｏ ａ ｓｐｅｃific pageİı｜]',
+
+	gotoDialogTitle: '[G\'Ｇｏ ｔo Pageİı｜]',
+	gotoDialogMainMsg: '[G\'Ｓｐｅｃｉｆｙ ｔｈｅ page number:İı｜]',
+	gotoDialogPageCount: '[G\'([${0}] ｐａges)İı｜]',
+	gotoDialogOKBtn: '[G\'Goİı｜]',
+	gotoDialogCancelBtn: '[G\'Cancelİı｜]',
+	
+	// for drop down pagination bar
+	pageLabel: '[G\'Pageİı｜]',
+	pageSizeLabel: '[G\'Rowsİı｜]',
+
+//QuickFilter
+	filterLabel: '[G\'Filterİı｜]',
+	clearButtonTitle: '[G\'Ｃｌｅａr Filterİı｜]',
+	buildFilterMenuLabel: '[G\'Ｂｕｉｌｄ Filter…İı｜]',
+	apply: '[G\'Ａｐｐｌy Filterİı｜]',
+
+//SummaryBar
+	summary: '[G\'Ｔotal: [${0}]İı｜]',
+	summaryWithSelection: '[G\'Ｔｏｔａｌ: [${0}] Ｓｅｌｅcted: [${1}]İı｜]',
+
+//Sort [NEED TRANSLATION]
+	helpMsg: '[G\'[${0}] - Ｃｌｉｃｋ ｔｏ ｓｏｒｔ ｏｒ control-click to add to sortİı｜]',
+	singleHelpMsg: '[G\'[${0}] - Ｃｌｉｃｋ ｔｏ sortİı｜]',
+	priorityOrder: '[G\'ｓｏｒｔ ｐｒiority [${0}]İı｜]'
+})
+);

data/app/assets/javascripts/gridx/support/DropDownPager.js

@@ -5,10 +5,8 @@ define([
 	"dijit/_WidgetBase",
 	"dijit/_FocusMixin",
 	"dijit/_TemplatedMixin",
-	"dojo/i18n",
-	"dijit/form/FilteringSelect",
-	"dojo/i18n!../nls/PaginationBar"
-], function(declare, lang, Store, _WidgetBase, _FocusMixin, _TemplatedMixin, i18n, FilteringSelect){
+	"dijit/form/FilteringSelect"
+], function(declare, lang, Store, _WidgetBase, _FocusMixin, _TemplatedMixin, FilteringSelect){
 
 /*=====
 	return declare([_WidgetBase, _FocusMixin, _TemplatedMixin], {
@@ -35,7 +33,7 @@ define([
 		templateString: '<div class="gridxDropDownPager"><label class="gridxPagerLabel">${pageLabel}</label></div>',
 
 		constructor: function(args){
-			lang.mixin(this, i18n.getLocalization('gridx', 'PaginationBar', this.lang || args.grid.lang));
+			lang.mixin(this, args.grid.nls);
 		},
 
 		postCreate: function(){

data/app/assets/javascripts/gridx/support/DropDownSizer.js

@@ -4,10 +4,8 @@ define([
 	"dijit/_WidgetBase",
 	"dijit/_FocusMixin",
 	"dijit/_TemplatedMixin",
-	"dojo/i18n",
-	"dijit/form/Select",
-	"dojo/i18n!../nls/PaginationBar"
-], function(declare, lang, _WidgetBase, _FocusMixin, _TemplatedMixin, i18n, Select){
+	"dijit/form/Select"
+], function(declare, lang, _WidgetBase, _FocusMixin, _TemplatedMixin, Select){
 
 /*=====
 	return declare([_WidgetBase, _FocusMixin, _TemplatedMixin], {
@@ -38,7 +36,7 @@ define([
 		templateString: '<div class="gridxDropDownSizer"><label class="gridxPagerLabel">${pageSizeLabel}</label></div>',
 
 		constructor: function(args){
-			lang.mixin(this, i18n.getLocalization('gridx', 'PaginationBar', this.lang || args.grid.lang));
+			lang.mixin(this, args.grid.nls);
 		},
 
 		postCreate: function(){

data/app/assets/javascripts/gridx/support/GotoPagePane.js

@@ -6,10 +6,8 @@ define([
 	"dijit/_WidgetBase",
 	"dijit/_TemplatedMixin",
 	"dijit/_WidgetsInTemplateMixin",
-	"dojo/text!../templates/GotoPagePane.html",
-	"dojo/i18n",
-	"dojo/i18n!../nls/PaginationBar"
-], function(declare, lang, event, keys, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, goToTemplate, i18n){
+	"dojo/text!../templates/GotoPagePane.html"
+], function(declare, lang, event, keys, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, goToTemplate){
 
 /*=====
 	return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
@@ -27,7 +25,7 @@ define([
 	
 		postMixInProperties: function(){
 			var t = this;
-			lang.mixin(t, i18n.getLocalization('gridx', 'PaginationBar', t.pagination.grid.lang));
+			lang.mixin(t, t.pagination.grid.nls);
 			t.numberTextBoxClass = t.pager.numberTextBoxClass.prototype.declaredClass;
 			t.buttonClass = t.pager.buttonClass.prototype.declaredClass;
 			t.connect(t.domNode, 'onkeydown', '_onKeyDown');

data/app/assets/javascripts/gridx/support/QuickFilter.js

@@ -13,13 +13,11 @@ define([
 	'dijit/Menu',
 	'dijit/MenuItem',
 	'../modules/Filter',
-	'dojo/i18n',
-	'dojo/text!../templates/QuickFilter.html',
-	'dojo/i18n!../nls/QuickFilter'
+	'dojo/text!../templates/QuickFilter.html'
 ], function(declare, lang, array, domClass, keys,
 	_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin,
 	TextBox, Button, ComboButton, Menu, MenuItem,
-	F, i18n, template){
+	F, template){
 
 /*=====
 	return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
@@ -46,7 +44,7 @@ define([
 
 		constructor: function(args){
 			var t = this;
-			lang.mixin(t, i18n.getLocalization('gridx', 'QuickFilter', args.grid.lang));
+			lang.mixin(t, args.grid.nls);
 			t._hasFilterBar = args.grid.filterBar ? 'gridxQuickFilterHasFilterBar' : 'gridxQuickFilterNoFilterBar';
 			t.connect(args.grid.model, 'setStore', function(){
 				t.textBox.set('value', '');

data/app/assets/javascripts/gridx/support/Summary.js

@@ -2,10 +2,8 @@ define([
 	"dojo/_base/declare",
 	"dojo/string",
 	"dijit/_WidgetBase",
-	"dijit/_TemplatedMixin",
-	"dojo/i18n",
-	"dojo/i18n!../nls/SummaryBar"
-], function(declare, string, _WidgetBase, _TemplatedMixin, i18n){
+	"dijit/_TemplatedMixin"
+], function(declare, string, _WidgetBase, _TemplatedMixin){
 
 /*=====
 	return declare([_WidgetBase, _TemplatedMixin], {
@@ -27,23 +25,47 @@ define([
 
 		grid: null,
 
+		//message: 'Total: ${0} Selected: ${1}',
+
 		postCreate: function(){
 			var t = this,
-				c = 'connect',
 				m = t.grid.model;
-			t[c](m, 'onSizeChange', 'refresh');
-			t[c](m, 'onMarkChange', 'refresh');
-			t._nls = i18n.getLocalization('gridx', 'SummaryBar', t.lang || t.grid.lang);
+			t.connect(m, 'onSizeChange', 'refresh');
+			t.connect(m, 'onMarkChange', 'refresh');
+			if(t.grid.pagination){
+				t.connect(t.grid.pagination, 'onSwitchPage', 'refresh');
+				t.connect(t.grid.pagination, 'onChangePageSize', 'refresh');
+			}
 			t.refresh();
 		},
 
 		refresh: function(){
 			var g = this.grid,
 				sr = g.select && g.select.row,
+				pagination = g.pagination,
 				size = g.model.size(),
 				selected = sr ? sr.getSelected().length : 0,
-				tpl = sr ? this._nls.summaryWithSelection : this._nls.summary;
-			this.domNode.innerHTML = string.substitute(tpl, [size, selected]);
+				tpl = this.message;
+			if(pagination){
+				var cp = pagination.currentPage(),
+					firstIdx = pagination.firstIndexInPage(cp) + 1,
+					lastIdx = pagination.lastIndexInPage(cp) + 1;
+			}
+			if(g.getSummaryMessage){
+				tpl = g.getSummaryMessage();
+			}
+			if(!tpl){
+				tpl = [];
+				if(pagination){
+					tpl.push(string.substitute(g.nls.summaryRange, [firstIdx, lastIdx]));
+				}
+				tpl.push(string.substitute(g.nls.summaryTotal, [size >= 0 ? size : 0]));
+				if(sr){
+					tpl.push(string.substitute(g.nls.summarySelected, [selected]));
+				}
+				tpl = tpl.join(' ');
+			}
+			this.domNode.innerHTML = string.substitute(tpl, [size >= 0 ? size : 0, selected, firstIdx, lastIdx]);
 		}
 	});
 });

data/app/assets/javascripts/gridx/support/_LinkPageBase.js

@@ -6,10 +6,8 @@ define([
 	"dojo/dom-class",
 	"dijit/_WidgetBase",
 	"dijit/_FocusMixin",
-	"dijit/_TemplatedMixin",
-	"dojo/i18n",
-	"dojo/i18n!../nls/PaginationBar"
-], function(declare, lang, array, has, domClass, _WidgetBase, _FocusMixin, _TemplatedMixin, i18n){
+	"dijit/_TemplatedMixin"
+], function(declare, lang, array, has, domClass, _WidgetBase, _FocusMixin, _TemplatedMixin){
 
 /*=====
 	return declare([_WidgetBase, _TemplatedMixin, _FocusMixin], {
@@ -23,7 +21,7 @@ define([
 	return declare([_WidgetBase, _TemplatedMixin, _FocusMixin], {
 		constructor: function(args){
 			var t = this;
-			lang.mixin(t, i18n.getLocalization('gridx', 'PaginationBar'));
+			lang.mixin(t, args.grid.nls);
 			if(has('ie')){
 				//IE does not support inline-block, so have to set tabIndex
 				var gridTabIndex = args.grid.domNode.getAttribute('tabindex');

data/app/assets/javascripts/gridx/support/query.js

@@ -0,0 +1,47 @@
+define([
+	'dojo/query',
+	'dojo/_base/array',
+	'dojo/_base/lang'
+], function(query, array, lang){
+	
+	var _query = function(selector, context){
+		
+		var nlist = query.apply(null, arguments);
+		return nlist;
+		
+		
+		if(!context || typeof selector === 'object'
+			||(typeof selector === 'string' && /^[^>]*>\s*[^>\s]*$/.test(selector))
+		){
+			return nlist;
+		}
+		
+		var currentGrid = query(context).closest('.gridx')[0];
+		
+		if(currentGrid){
+			var id = currentGrid.getAttribute('id');
+			
+			if(!_query.isGridInGrid[id] || !query('.gridx', currentGrid).length
+				|| !currentGrid.childNodes[2].childNodes[1].contains(context)
+			){
+				return nlist;
+			}
+			
+		}else{
+			return nlist;
+		}
+		
+		return nlist.filter(function(n){
+			return query(n).closest('.gridx')[0] === currentGrid;
+		});
+		
+		//return new query.NodeList(nlist);
+	};
+	
+	_query.isGridInGrid = {};
+
+	lang.mixin(_query, query);
+	// gq = _query;
+	return _query;
+
+});

data/app/assets/javascripts/gridx/templates/FilterBar.html

@@ -1,7 +1,7 @@
 <input type="button" data-dojo-type="dijit.form.Button" data-dojo-props="
 	iconClass: 'gridxFilterBarBtnIcon',
 	label: '...',
-	title: '${defineFilter}'" aria-label='${defineFilter}'
+	title: &quot;${defineFilter}&quot;" aria-label="${defineFilter}"
 /><div class="gridxFilterBarStatus"
 	><span>${noFilterApplied}</span
 	><span class="gridxFilterBarCloseBtn" tabindex="-1" title="${closeFilterBarBtn}"><span class="gridxFilterBarCloseBtnText">x</span></span

data/app/assets/javascripts/gridx/templates/QuickFilter.html

@@ -3,7 +3,7 @@
 		><input type="text" data-dojo-type="${textBoxClass}"
 			class="gridxQuickFilterInput"
 			data-dojo-attach-point="textBox"
-			data-dojo-props="placeHolder: '${filterLabel}', 'aria-label': '${filterLabel}'"
+			data-dojo-props="placeHolder: &quot;${filterLabel}&quot;, 'aria-label': &quot;${filterLabel}&quot;"
 		/><span class="gridxQuickFilterClear"
 			tabindex='0'
 			data-dojo-attach-event="onclick: _clear, onkeydown: _onKey"
@@ -15,7 +15,7 @@
 		class="gridxQuickFilterButton"
 		data-dojo-props="
 			showLabel: false,
-			title: '${filterLabel}',
+			title: &quot;${filterLabel}&quot;,
 			iconClass: 'gridxQuickFilterIcon'"
 		data-dojo-attach-event="onClick: _filter"
 	></button
@@ -23,7 +23,7 @@
 		class="gridxQuickFilterComboButton"
 		data-dojo-props="
 			showLabel: false,
-			title: '${filterLabel}',
+			title: &quot;${filterLabel}&quot;,
 			iconClass: 'gridxQuickFilterIcon'"
 		data-dojo-attach-event="onClick: _filter"
 		><span data-dojo-type="${menuClass}">