Browse Source

Updated en-US locale

zhixin 6 years ago
parent
commit
5f05621a44

+ 6 - 6
src/bootstrap-table.js

@@ -500,13 +500,13 @@
       return 'Loading, please wait...'
     },
     formatRecordsPerPage (pageNumber) {
-      return Utils.sprintf('%s rows per page', pageNumber)
+      return `${pageNumber} rows per page`
     },
     formatShowingRows (pageFrom, pageTo, totalRows) {
-      return Utils.sprintf('Showing %s to %s of %s rows', pageFrom, pageTo, totalRows)
+      return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     },
     formatDetailPagination (totalRows) {
-      return Utils.sprintf('Showing %s rows', totalRows)
+      return `Showing ${totalRows} rows`
     },
     formatSearch () {
       return 'Search'
@@ -523,12 +523,12 @@
     formatToggle () {
       return 'Toggle'
     },
-    formatFullscreen () {
-      return 'Fullscreen'
-    },
     formatColumns () {
       return 'Columns'
     },
+    formatFullscreen () {
+      return 'Fullscreen'
+    },
     formatAllRows () {
       return 'All'
     }

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

@@ -13,6 +13,9 @@
     formatShowingRows (pageFrom, pageTo, totalRows) {
       return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     },
+    formatDetailPagination (totalRows) {
+      return `Showing ${totalRows} rows`
+    },
     formatSearch () {
       return 'Search'
     },
@@ -31,14 +34,29 @@
     formatColumns () {
       return 'Columns'
     },
+    formatFullscreen () {
+      return 'Fullscreen'
+    },
     formatAllRows () {
       return 'All'
     },
+    formatAutoRefresh () {
+      return 'Auto Refresh'
+    },
     formatExport () {
       return 'Export data'
     },
     formatClearFilters () {
       return 'Clear filters'
+    },
+    formatJumpto () {
+      return 'GO'
+    },
+    formatAdvancedSearch () {
+      return 'Advanced search'
+    },
+    formatAdvancedCloseButton () {
+      return 'Close'
     }
   }
 

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

@@ -1,46 +0,0 @@
-/**
- * Bootstrap Table English translation
- * Author: Zhixin Wen<wenzhixin2010@gmail.com>
- */
-($ => {
-  $.fn.bootstrapTable.locales['en-US'] = {
-    formatLoadingMessage() {
-      return 'Loading, please wait...'
-    },
-    formatRecordsPerPage(pageNumber) {
-      return pageNumber + ' rows per page'
-    },
-    formatShowingRows(pageFrom, pageTo, totalRows) {
-      return 'Showing ' + pageFrom + ' to ' + pageTo + ' of ' + totalRows + ' rows'
-    },
-    formatSearch() {
-      return 'Search'
-    },
-    formatNoMatches() {
-      return 'No matching records found'
-    },
-    formatPaginationSwitch() {
-      return 'Hide/Show pagination'
-    },
-    formatRefresh() {
-      return 'Refresh'
-    },
-    formatToggle() {
-      return 'Toggle'
-    },
-    formatColumns() {
-      return 'Columns'
-    },
-    formatAllRows() {
-      return 'All'
-    },
-    formatExport() {
-      return 'Export data'
-    },
-    formatClearFilters() {
-      return 'Clear filters'
-    }
-  }
-
-  $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['en-US'])
-})(jQuery)