Browse Source

Merge pull request #2279 from wenzhixin/feature/formatExport

feat(export extension): add formatExport locale
wenzhixin 9 years ago
parent
commit
ab86da9d7d

+ 8 - 0
src/extensions/export/bootstrap-table-export.js

@@ -32,6 +32,13 @@
         export: 'glyphicon-export icon-share'
         export: 'glyphicon-export icon-share'
     });
     });
 
 
+    $.extend($.fn.bootstrapTable.locales, {
+        formatExport: function () {
+            return 'Export data';
+        }
+    });
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
+
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
         _initToolbar = BootstrapTable.prototype.initToolbar;
         _initToolbar = BootstrapTable.prototype.initToolbar;
 
 
@@ -52,6 +59,7 @@
                             sprintf(' btn-%s', this.options.buttonsClass) +
                             sprintf(' btn-%s', this.options.buttonsClass) +
                             sprintf(' btn-%s', this.options.iconSize) +
                             sprintf(' btn-%s', this.options.iconSize) +
                             ' dropdown-toggle" ' +
                             ' dropdown-toggle" ' +
+                            'title="' + this.options.formatExport() + '" ' +
                             'data-toggle="dropdown" type="button">',
                             'data-toggle="dropdown" type="button">',
                             sprintf('<i class="%s %s"></i> ', this.options.iconsPrefix, this.options.icons.export),
                             sprintf('<i class="%s %s"></i> ', this.options.iconsPrefix, this.options.icons.export),
                             '<span class="caret"></span>',
                             '<span class="caret"></span>',

+ 9 - 9
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -189,7 +189,7 @@
                     //Added the default option
                     //Added the default option
                     addOptionToSelectControl(selectControl, '', '');
                     addOptionToSelectControl(selectControl, '', '');
                 }
                 }
-                
+
                 var uniqueValues = {};
                 var uniqueValues = {};
                 for (var i = 0; i < z; i++) {
                 for (var i = 0; i < z; i++) {
                     //Added a new value
                     //Added a new value
@@ -201,7 +201,7 @@
                 for (var key in uniqueValues) {
                 for (var key in uniqueValues) {
                     addOptionToSelectControl(selectControl, uniqueValues[key], key);
                     addOptionToSelectControl(selectControl, uniqueValues[key], key);
                 }
                 }
-                
+
                 sortSelectControl(selectControl);
                 sortSelectControl(selectControl);
             }
             }
         });
         });
@@ -437,6 +437,13 @@
         clear: 'glyphicon-trash icon-clear'
         clear: 'glyphicon-trash icon-clear'
     });
     });
 
 
+    $.extend($.fn.bootstrapTable.locales, {
+        formatClearFilters: function () {
+            return 'Clear Filters';
+        }
+    });
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
+
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
         _init = BootstrapTable.prototype.init,
         _init = BootstrapTable.prototype.init,
         _initToolbar = BootstrapTable.prototype.initToolbar,
         _initToolbar = BootstrapTable.prototype.initToolbar,
@@ -482,13 +489,6 @@
         _init.apply(this, Array.prototype.slice.apply(arguments));
         _init.apply(this, Array.prototype.slice.apply(arguments));
     };
     };
 
 
-    $.extend($.fn.bootstrapTable.locales, {
-        formatClearFilters: function () {
-            return 'Clear Filters';
-        }
-    });
-    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
-
     BootstrapTable.prototype.initToolbar = function () {
     BootstrapTable.prototype.initToolbar = function () {
         this.showToolbar = this.options.filterControl && this.options.filterShowClear;
         this.showToolbar = this.options.filterControl && this.options.filterShowClear;
 
 

+ 6 - 0
src/locale/bootstrap-table-en-US.js

@@ -35,6 +35,12 @@
         },
         },
         formatAllRows: function () {
         formatAllRows: function () {
             return 'All';
             return 'All';
+        },
+        formatExport: function () {
+            return 'Export data';
+        },
+        formatClearFilters: function () {
+            return 'Clear filters';
         }
         }
     };
     };
 
 

+ 6 - 0
src/locale/bootstrap-table-en-US.js.template

@@ -35,6 +35,12 @@
         },
         },
         formatAllRows: function () {
         formatAllRows: function () {
             return 'All';
             return 'All';
+        },
+        formatExport: function () {
+            return 'Export data';
+        },
+        formatClearFilters: function () {
+            return 'Clear filters';
         }
         }
     };
     };
 
 

+ 24 - 15
src/locale/bootstrap-table-nl-NL.js

@@ -2,39 +2,48 @@
  * Bootstrap Table Dutch translation
  * Bootstrap Table Dutch translation
  * Author: Your Name <info@a2hankes.nl>
  * Author: Your Name <info@a2hankes.nl>
  */
  */
-(function ($) {
+(function($) {
     'use strict';
     'use strict';
 
 
     $.fn.bootstrapTable.locales['nl-NL'] = {
     $.fn.bootstrapTable.locales['nl-NL'] = {
-        formatLoadingMessage: function () {
+        formatLoadingMessage: function() {
             return 'Laden, even geduld...';
             return 'Laden, even geduld...';
         },
         },
-        formatRecordsPerPage: function (pageNumber) {
+        formatRecordsPerPage: function(pageNumber) {
             return pageNumber + ' records per pagina';
             return pageNumber + ' records per pagina';
         },
         },
-        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+        formatShowingRows: function(pageFrom, pageTo, totalRows) {
             return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
             return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
         },
         },
-        formatDetailPagination: function (totalRows) {
+        formatDetailPagination: function(totalRows) {
             return 'Toon ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
             return 'Toon ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
         },
         },
-        formatSearch: function () {
+        formatSearch: function() {
             return 'Zoeken';
             return 'Zoeken';
         },
         },
-        formatNoMatches: function () {
+        formatNoMatches: function() {
             return 'Geen resultaten gevonden';
             return 'Geen resultaten gevonden';
         },
         },
-        formatRefresh: function () {
-           return 'Vernieuwen';
+        formatRefresh: function() {
+            return 'Vernieuwen';
         },
         },
-        formatToggle: function () {
-          return 'Omschakelen';
+        formatToggle: function() {
+            return 'Omschakelen';
         },
         },
-        formatColumns: function () {
-          return 'Kolommen';
+        formatColumns: function() {
+            return 'Kolommen';
         },
         },
-        formatAllRows: function () {
-          return 'Alle';
+        formatAllRows: function() {
+            return 'Alle';
+        },
+        formatPaginationSwitch: function() {
+            return 'Verberg/Toon paginatie';
+        },
+        formatExport: function() {
+            return 'Exporteer data';
+        },
+        formatClearFilters: function() {
+            return 'Verwijder filters';
         }
         }
     };
     };
 
 

+ 7 - 1
src/locale/bootstrap-table-zh-CN.js

@@ -32,9 +32,15 @@
         },
         },
         formatColumns: function () {
         formatColumns: function () {
             return '列';
             return '列';
+        },
+        formatExport: function () {
+            return '导出数据';
+        },
+        formatClearFilters: function () {
+            return '清空过滤';
         }
         }
     };
     };
 
 
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
 
 
-})(jQuery);
+})(jQuery);