Browse Source

Merge pull request #4 from wenzhixin/master

Update my repo to implement locale
Dennis Hernández 11 years ago
parent
commit
400bf9151d
95 changed files with 455 additions and 237 deletions
  1. 16 0
      CHANGELOG.md
  2. 0 3
      README.md
  3. 1 1
      bootstrap-table.jquery.json
  4. 1 1
      bower.json
  5. 2 2
      dist/bootstrap-table.min.css
  6. 2 2
      dist/bootstrap-table.min.js
  7. 2 2
      dist/extensions/editable/bootstrap-table-editable.min.js
  8. 1 1
      dist/extensions/export/bootstrap-table-export.min.js
  9. 1 1
      dist/extensions/filter/bootstrap-table-filter.min.js
  10. 1 1
      dist/extensions/flatJSON/bootstrap-table-flatJSON.min.js
  11. 2 2
      dist/locale/bootstrap-table-cs-CZ.min.js
  12. 2 2
      dist/locale/bootstrap-table-da-DK.min.js
  13. 7 0
      dist/locale/bootstrap-table-de-DE.min.js
  14. 2 2
      dist/locale/bootstrap-table-el-GR.min.js
  15. 2 2
      dist/locale/bootstrap-table-en-US.min.js
  16. 2 2
      dist/locale/bootstrap-table-es-AR.min.js
  17. 2 2
      dist/locale/bootstrap-table-es-CR.min.js
  18. 2 2
      dist/locale/bootstrap-table-es-NI.min.js
  19. 2 2
      dist/locale/bootstrap-table-fr-BE.min.js
  20. 2 2
      dist/locale/bootstrap-table-fr-FR.min.js
  21. 7 0
      dist/locale/bootstrap-table-hu-HU.min.js
  22. 2 2
      dist/locale/bootstrap-table-it-IT.min.js
  23. 2 2
      dist/locale/bootstrap-table-ko-KR.min.js
  24. 2 2
      dist/locale/bootstrap-table-nl-NL.min.js
  25. 2 2
      dist/locale/bootstrap-table-pl-PL.min.js
  26. 2 2
      dist/locale/bootstrap-table-pt-BR.min.js
  27. 2 2
      dist/locale/bootstrap-table-ru-RU.min.js
  28. 7 0
      dist/locale/bootstrap-table-sk-SK.min.js
  29. 2 2
      dist/locale/bootstrap-table-th-TH.min.js
  30. 2 2
      dist/locale/bootstrap-table-tr-TR.min.js
  31. 2 2
      dist/locale/bootstrap-table-ur-PK.min.js
  32. 2 2
      dist/locale/bootstrap-table-vi-VN.min.js
  33. 2 2
      dist/locale/bootstrap-table-zh-CN.min.js
  34. 2 2
      dist/locale/bootstrap-table-zh-TW.min.js
  35. 1 1
      docs/_config.yml
  36. 10 1
      docs/_includes/documentation/column-options.md
  37. 20 0
      docs/_includes/documentation/methods.md
  38. 3 1
      docs/_includes/getting-started/usage.md
  39. 14 19
      docs/_includes/latest-release.md
  40. 2 2
      docs/dist/bootstrap-table.min.css
  41. 2 2
      docs/dist/bootstrap-table.min.js
  42. 2 2
      docs/dist/extensions/editable/bootstrap-table-editable.min.js
  43. 1 1
      docs/dist/extensions/export/bootstrap-table-export.min.js
  44. 1 1
      docs/dist/extensions/filter/bootstrap-table-filter.min.js
  45. 1 1
      docs/dist/extensions/flatJSON/bootstrap-table-flatJSON.min.js
  46. 2 2
      docs/dist/locale/bootstrap-table-cs-CZ.min.js
  47. 2 2
      docs/dist/locale/bootstrap-table-da-DK.min.js
  48. 7 0
      docs/dist/locale/bootstrap-table-de-DE.min.js
  49. 2 2
      docs/dist/locale/bootstrap-table-el-GR.min.js
  50. 2 2
      docs/dist/locale/bootstrap-table-en-US.min.js
  51. 2 2
      docs/dist/locale/bootstrap-table-es-AR.min.js
  52. 2 2
      docs/dist/locale/bootstrap-table-es-CR.min.js
  53. 2 2
      docs/dist/locale/bootstrap-table-es-NI.min.js
  54. 2 2
      docs/dist/locale/bootstrap-table-fr-BE.min.js
  55. 2 2
      docs/dist/locale/bootstrap-table-fr-FR.min.js
  56. 7 0
      docs/dist/locale/bootstrap-table-hu-HU.min.js
  57. 2 2
      docs/dist/locale/bootstrap-table-it-IT.min.js
  58. 2 2
      docs/dist/locale/bootstrap-table-ko-KR.min.js
  59. 2 2
      docs/dist/locale/bootstrap-table-nl-NL.min.js
  60. 2 2
      docs/dist/locale/bootstrap-table-pl-PL.min.js
  61. 2 2
      docs/dist/locale/bootstrap-table-pt-BR.min.js
  62. 2 2
      docs/dist/locale/bootstrap-table-ru-RU.min.js
  63. 7 0
      docs/dist/locale/bootstrap-table-sk-SK.min.js
  64. 2 2
      docs/dist/locale/bootstrap-table-th-TH.min.js
  65. 2 2
      docs/dist/locale/bootstrap-table-tr-TR.min.js
  66. 2 2
      docs/dist/locale/bootstrap-table-ur-PK.min.js
  67. 2 2
      docs/dist/locale/bootstrap-table-vi-VN.min.js
  68. 2 2
      docs/dist/locale/bootstrap-table-zh-CN.min.js
  69. 2 2
      docs/dist/locale/bootstrap-table-zh-TW.min.js
  70. 79 41
      src/bootstrap-table.js
  71. 5 2
      src/locale/bootstrap-table-cs-CZ.js
  72. 5 2
      src/locale/bootstrap-table-da-DK.js
  73. 5 2
      src/locale/bootstrap-table-de-DE.js
  74. 5 2
      src/locale/bootstrap-table-el-GR.js
  75. 5 2
      src/locale/bootstrap-table-en-US.js
  76. 5 2
      src/locale/bootstrap-table-en-US.js.template
  77. 5 2
      src/locale/bootstrap-table-es-AR.js
  78. 5 2
      src/locale/bootstrap-table-es-CR.js
  79. 5 2
      src/locale/bootstrap-table-es-NI.js
  80. 5 2
      src/locale/bootstrap-table-fr-BE.js
  81. 5 2
      src/locale/bootstrap-table-fr-FR.js
  82. 5 2
      src/locale/bootstrap-table-hu-HU.js
  83. 5 2
      src/locale/bootstrap-table-it-IT.js
  84. 5 2
      src/locale/bootstrap-table-ko-KR.js
  85. 5 2
      src/locale/bootstrap-table-nl-NL.js
  86. 5 2
      src/locale/bootstrap-table-pl-PL.js
  87. 5 2
      src/locale/bootstrap-table-pt-BR.js
  88. 5 2
      src/locale/bootstrap-table-ru-RU.js
  89. 37 0
      src/locale/bootstrap-table-sk-SK.js
  90. 14 21
      src/locale/bootstrap-table-th-TH.js
  91. 5 2
      src/locale/bootstrap-table-tr-TR.js
  92. 5 2
      src/locale/bootstrap-table-ur-PK.js
  93. 5 2
      src/locale/bootstrap-table-vi-VN.js
  94. 5 2
      src/locale/bootstrap-table-zh-CN.js
  95. 5 2
      src/locale/bootstrap-table-zh-TW.js

+ 16 - 0
CHANGELOG.md

@@ -1,5 +1,21 @@
 ## ChangeLog
 
+### 1.5.0
+
+- [bug] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
+- [bug] Fix IE browser display header bug when use `mergeCells` method.
+- [bug] Fix #269: array as row bug.
+- [bug] Fix #314: `rowStyle` bug.
+- [enh] Add de-DE, hu-HU, sk-SK locales.
+- [enh] Fix #261: add namespace to `.table` style.
+- [bug] Fix #160, #323: operate events don't work in card view.
+- [enh] Add `filterBy`, `scrollTo`, `prevPage` and `nextPage`, `check` and `uncheck` methods.
+- [enh] Add `onPreBody` and `onPostBody` events.
+- [enh] Add `searchable` column option.
+- [enh] Fix #59: support load multiple locale files.
+- [enh] Modify the scope of the column events.
+- [enh] Improve editable extension.
+
 ### 1.4.0
 
 - [enh] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.

+ 0 - 3
README.md

@@ -16,9 +16,6 @@ To get started, check out http://bootstrap-table.wenzhixin.net.cn!
 
 ## Bugs & Enhancements (next version)
 
-- [x] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
-- [x] Fix #261: add namespace to `.table` style.
-
 ## Features
 
 * Created for Bootstrap 3 (Bootstrap 2 supported)

+ 1 - 1
bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-table",
-    "version": "1.4.0",
+    "version": "1.5.0",
     "title": "Bootstrap Table",
     "description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
     "author": {

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-table",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "homepage": "https://github.com/wenzhixin/bootstrap-table",
   "authors": [
     "zhixin <wenzhixin2010@gmail.com>"

File diff suppressed because it is too large
+ 2 - 2
dist/bootstrap-table.min.css


File diff suppressed because it is too large
+ 2 - 2
dist/bootstrap-table.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/extensions/editable/bootstrap-table-editable.min.js


+ 1 - 1
dist/extensions/export/bootstrap-table-export.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/filter/bootstrap-table-filter.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/extensions/flatJSON/bootstrap-table-flatJSON.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-cs-CZ.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-da-DK.min.js


File diff suppressed because it is too large
+ 7 - 0
dist/locale/bootstrap-table-de-DE.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-el-GR.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-en-US.min.js


+ 2 - 2
dist/locale/bootstrap-table-es-AR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-AR"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-es-CR.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-es-NI.min.js


+ 2 - 2
dist/locale/bootstrap-table-fr-BE.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-fr-FR.min.js


File diff suppressed because it is too large
+ 7 - 0
dist/locale/bootstrap-table-hu-HU.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-it-IT.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-ko-KR.min.js


+ 2 - 2
dist/locale/bootstrap-table-nl-NL.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-pl-PL.min.js


+ 2 - 2
dist/locale/bootstrap-table-pt-BR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Carregando, aguarde…"},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Exibindo "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Busca"},formatNoMatches:function(){return"Nenhum registro encontrado"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["pt-BR"]={formatLoadingMessage:function(){return"Carregando, aguarde…"},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Exibindo "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Busca"},formatNoMatches:function(){return"Nenhum registro encontrado"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-BR"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-ru-RU.min.js


File diff suppressed because it is too large
+ 7 - 0
dist/locale/bootstrap-table-sk-SK.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-th-TH.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-tr-TR.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-ur-PK.min.js


+ 2 - 2
dist/locale/bootstrap-table-vi-VN.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["vi-VN"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-zh-CN.min.js


File diff suppressed because it is too large
+ 2 - 2
dist/locale/bootstrap-table-zh-TW.min.js


+ 1 - 1
docs/_config.yml

@@ -11,7 +11,7 @@ highlighter: rouge
 permalink: pretty
 
 # Custom vars
-current_version: 1.4.0
+current_version: 1.5.0
 repo: https://github.com/wenzhixin/bootstrap-table
 website: http://wenzhixin.net.cn
 repos: http://repos.wenzhixin.net.cn

+ 10 - 1
docs/_includes/documentation/column-options.md

@@ -166,5 +166,14 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         Support classes or css.
         </td>
     </tr>
+    <tr>
+        <td>searchable</td>
+        <td>data-searchable</td>
+        <td>Boolean</td>
+        <td>true</td>
+        <td>
+        True to search data for this column.
+        </td>
+    </tr>
     </tbody>
-</table>
+</table>

+ 20 - 0
docs/_includes/documentation/methods.md

@@ -92,6 +92,16 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
         <td>Uncheck all current page rows.</td>
     </tr>
     <tr>
+        <td>check</td>
+        <td>index</td>
+        <td>Check a row, the row index start with 0.</td>
+    </tr>
+    <tr>
+        <td>uncheck</td>
+        <td>index</td>
+        <td>Uncheck a row, the row index start with 0.</td>
+    </tr>
+    <tr>
         <td>resetView</td>
         <td>params</td>
         <td>Reset the bootstrap table view, for example reset the table height.</td>
@@ -121,5 +131,15 @@ The calling method syntax: `$('#table').bootstrapTable('method', parameter);`.
         <td>params</td>
         <td>(Can use only in client-side)Filter data in table, eg. you can filter <code>{age: 10}</code> to show the data only age is equal to 10.</td>
     </tr>
+    <tr>
+        <td>prevPage</td>
+        <td>none</td>
+        <td>Go to previous page.</td>
+    </tr>
+    <tr>
+        <td>nextPage</td>
+        <td>none</td>
+        <td>Go to next page.</td>
+    </tr>
     </tbody>
 </table>

+ 3 - 1
docs/_includes/getting-started/usage.md

@@ -15,6 +15,8 @@ Include jQuery library, bootstrap library (if your project doesn't use it alread
 <script src="jquery.min.js"></script>
 <script src="bootstrap.min.js"></script>
 <script src="bootstrap-table.js"></script>
+<-- put your locale files after bootstrap-table.js -->
+<script src="bootstrap-table-zh-CN.js"></script>
 ```
 
 ---
@@ -111,4 +113,4 @@ $('#table').bootstrapTable({
         title: 'Item Price'
     }, ]
 });
-```
+```

+ 14 - 19
docs/_includes/latest-release.md

@@ -1,22 +1,17 @@
 ### Latest release
 
-#### v{{ site.current_version }} (2014-11-21)
+#### v{{ site.current_version }} (2014-12-12)
 
-- [enh] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.
-- [enh] Fix #149: Hide empty data on Card view.
-- [enh] Fix #131: Add `onPageChange` event.
-- [enh] Add `onSearch` event.
-- [enh] Apply `width` column option to row style.
-- [enh] Add bootstrap-table-filter extension.
-- [enh] Add cs-CZ, es-CR, es-NI, pl-PL, ur-PK, ko-KR, th-TH locales.
-- [bug] Fix `minimumCountColumns` option init error.
-- [bug] Fix #161: `undefined` or `null` string sort bug.
-- [bug] Fix #171: IE disabled button can be clicked bug.
-- [bug] Fix #185: Reset the page to the first page when changing the url with `refresh` method.
-- [bug] Fix #202: updateRow method keep the scroll position.
-- [enh] Add `smartDisplay` option.
-- [enh] Add `searchAlign` and `toolbarAlign` options.
-- [enh] Fix #193: Add `dataType` option.
-- [enh] Add flatJSON and editable extensions.
-- [enh] Add `rowAttributes` option.
-- [enh] Update documentation.
+- [bug] Fix #144: `onCheck` and `onUncheck` events are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
+- [bug] Fix IE browser display header bug when use `mergeCells` method.
+- [bug] Fix #269: array as row bug.
+- [bug] Fix #314: `rowStyle` bug.
+- [enh] Add de-DE, hu-HU, sk-SK locales.
+- [enh] Fix #261: add namespace to `.table` style.
+- [bug] Fix #160, #323: operate events don't work in card view.
+- [enh] Add `filterBy`, `scrollTo`, `prevPage` and `nextPage`, `check` and `uncheck` methods.
+- [enh] Add `onPreBody` and `onPostBody` events.
+- [enh] Add `searchable` column option.
+- [enh] Fix #59: support load multiple locale files.
+- [enh] Modify the scope of the column events.
+- [enh] Improve editable extension.

File diff suppressed because it is too large
+ 2 - 2
docs/dist/bootstrap-table.min.css


File diff suppressed because it is too large
+ 2 - 2
docs/dist/bootstrap-table.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/extensions/editable/bootstrap-table-editable.min.js


+ 1 - 1
docs/dist/extensions/export/bootstrap-table-export.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/filter/bootstrap-table-filter.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/dist/extensions/flatJSON/bootstrap-table-flatJSON.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-cs-CZ.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-da-DK.min.js


File diff suppressed because it is too large
+ 7 - 0
docs/dist/locale/bootstrap-table-de-DE.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-el-GR.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-en-US.min.js


+ 2 - 2
docs/dist/locale/bootstrap-table-es-AR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["es-AR"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-AR"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-es-CR.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-es-NI.min.js


+ 2 - 2
docs/dist/locale/bootstrap-table-fr-BE.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-fr-FR.min.js


File diff suppressed because it is too large
+ 7 - 0
docs/dist/locale/bootstrap-table-hu-HU.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-it-IT.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-ko-KR.min.js


+ 2 - 2
docs/dist/locale/bootstrap-table-nl-NL.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["nl-NL"]={formatLoadingMessage:function(){return"Laden, even geduld…"},formatRecordsPerPage:function(a){return a+" records per pagina"},formatShowingRows:function(a,b,c){return"Toon "+a+" tot "+b+" van "+c+" records"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["nl-NL"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-pl-PL.min.js


+ 2 - 2
docs/dist/locale/bootstrap-table-pt-BR.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Carregando, aguarde…"},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Exibindo "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Busca"},formatNoMatches:function(){return"Nenhum registro encontrado"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["pt-BR"]={formatLoadingMessage:function(){return"Carregando, aguarde…"},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Exibindo "+a+" até "+b+" de "+c+" linhas"},formatSearch:function(){return"Busca"},formatNoMatches:function(){return"Nenhum registro encontrado"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["pt-BR"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-ru-RU.min.js


File diff suppressed because it is too large
+ 7 - 0
docs/dist/locale/bootstrap-table-sk-SK.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-th-TH.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-tr-TR.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-ur-PK.min.js


+ 2 - 2
docs/dist/locale/bootstrap-table-vi-VN.min.js

@@ -1,7 +1,7 @@
 /*
-* bootstrap-table - v1.4.0 - 2014-11-21
+* bootstrap-table - v1.5.0 - 2014-12-12
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
 */
-!function(a){"use strict";a.extend(a.fn.bootstrapTable.defaults,{formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}})}(jQuery);
+!function(a){"use strict";a.fn.bootstrapTable.locales["vi-VN"]={formatLoadingMessage:function(){return"Đang tải..."},formatRecordsPerPage:function(a){return a+" bản ghi mỗi trang"},formatShowingRows:function(a,b,c){return"Hiển thị từ trang "+a+" đến "+b+" của "+c+" bảng ghi"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["vi-VN"])}(jQuery);

File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-zh-CN.min.js


File diff suppressed because it is too large
+ 2 - 2
docs/dist/locale/bootstrap-table-zh-TW.min.js


+ 79 - 41
src/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.4.0
+ * version: 1.5.0
  * https://github.com/wenzhixin/bootstrap-table/
  */
 
@@ -170,6 +170,26 @@
 
         rowAttributes: function (row, index) {return {};},
 
+        onAll: function (name, args) {return false;},
+        onClickRow: function (item, $element) {return false;},
+        onDblClickRow: function (item, $element) {return false;},
+        onSort: function (name, order) {return false;},
+        onCheck: function (row) {return false;},
+        onUncheck: function (row) {return false;},
+        onCheckAll: function () {return false;},
+        onUncheckAll: function () {return false;},
+        onLoadSuccess: function (data) {return false;},
+        onLoadError: function (status) {return false;},
+        onColumnSwitch: function (field, checked) {return false;},
+        onPageChange: function (number, size) {return false;},
+        onSearch: function (text) {return false;},
+        onPreBody: function (data) {return false;},
+        onPostBody: function () {return false;}
+    };
+
+    BootstrapTable.LOCALES = [];
+
+    BootstrapTable.LOCALES['en-US'] = {
         formatLoadingMessage: function () {
             return 'Loading, please wait…';
         },
@@ -193,25 +213,11 @@
         },
         formatColumns: function () {
             return 'Columns';
-        },
-
-        onAll: function (name, args) {return false;},
-        onClickRow: function (item, $element) {return false;},
-        onDblClickRow: function (item, $element) {return false;},
-        onSort: function (name, order) {return false;},
-        onCheck: function (row) {return false;},
-        onUncheck: function (row) {return false;},
-        onCheckAll: function () {return false;},
-        onUncheckAll: function () {return false;},
-        onLoadSuccess: function (data) {return false;},
-        onLoadError: function (status) {return false;},
-        onColumnSwitch: function (field, checked) {return false;},
-        onPageChange: function (number, size) {return false;},
-        onSearch: function (text) {return false;},
-        onPreBody: function (data) {return false;},
-        onPostBody: function () {return false;}
+        }
     };
 
+    $.extend(BootstrapTable.DEFAULTS, BootstrapTable.LOCALES['en-US']);
+
     BootstrapTable.COLUMN_DEFAULTS = {
         radio: false,
         checkbox: false,
@@ -231,7 +237,8 @@
         formatter: undefined,
         events: undefined,
         sorter: undefined,
-        cellStyle: undefined
+        cellStyle: undefined,
+        searchable: true
     };
 
     BootstrapTable.EVENTS = {
@@ -353,7 +360,8 @@
             events: [],
             sorters: [],
             cellStyles: [],
-            clickToSelects: []
+            clickToSelects: [],
+            searchables: []
         };
         $.each(this.options.columns, function (i, column) {
             var text = '',
@@ -361,7 +369,8 @@
                 align = '', // body align style
                 style = '',
                 class_ = sprintf(' class="%s"', column['class']),
-                order = that.options.sortOrder || column.order;
+                order = that.options.sortOrder || column.order,
+                searchable = true;
 
             if (!column.visible) {
                 return;
@@ -381,6 +390,7 @@
             that.header.sorters.push(column.sorter);
             that.header.cellStyles.push(column.cellStyle);
             that.header.clickToSelects.push(column.clickToSelect);
+            that.header.searchables.push(column.searchable);
 
             html.push('<th',
                 column.checkbox || column.radio ?
@@ -558,8 +568,7 @@
         }
 
         if (this.options.showColumns) {
-            html.push(sprintf('<div class="keep-open %s" title="%s">',
-                this.options.showRefresh || this.options.showToggle ? 'btn-group' : '',
+            html.push(sprintf('<div class="keep-open btn-group" title="%s">',
                 this.options.formatColumns()),
                 '<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
                 '<i class="glyphicon glyphicon-th icon-th"></i>',
@@ -685,7 +694,8 @@
                         that.header.formatters[$.inArray(key, that.header.fields)],
                         [value, item, i], value);
 
-                    if ($.inArray(key, that.header.fields) !== -1 &&
+                    var index = $.inArray(key, that.header.fields);
+                    if (index !== -1 && that.header.searchables[index] &&
                         (typeof value === 'string' ||
                         typeof value === 'number') &&
                         (value + '').toLowerCase().indexOf(s) !== -1) {
@@ -943,7 +953,7 @@
             html.push('<tr',
                 sprintf(' %s', htmlAttributes.join(' ')),
                 sprintf(' id="%s"', $.isArray(item) ? undefined : item._id),
-                sprintf(' class="%s"', style.classes || $.isArray(item) ? undefined : item._class),
+                sprintf(' class="%s"', style.classes || ($.isArray(item) ? undefined : item._class)),
                 sprintf(' data-index="%s"', i),
                 '>'
             );
@@ -1070,12 +1080,9 @@
         this.$selectItem.off('click').on('click', function (event) {
             event.stopImmediatePropagation();
 
-            var checkAll = that.$selectItem.filter(':enabled').length ===
-                    that.$selectItem.filter(':enabled').filter(':checked').length,
-                checked = $(this).prop('checked'),
+            var checked = $(this).prop('checked'),
                 row = that.data[$(this).data('index')];
 
-            that.$selectAll.add(that.$selectAll_).prop('checked', checkAll);
             row[that.header.stateField] = checked;
             that.trigger(checked ? 'check' : 'uncheck', row);
 
@@ -1100,7 +1107,7 @@
             for (var key in events) {
                 that.$body.find('tr').each(function () {
                     var $tr = $(this),
-                        $td = $tr.find('td').eq(i),
+                        $td = $tr.find(that.options.cardView ? '.card-view' : 'td').eq(i),
                         index = key.indexOf(' '),
                         name = key.substring(0, index),
                         el = key.substring(index + 1),
@@ -1111,7 +1118,7 @@
                             row = that.data[index],
                             value = row[that.header.fields[i]];
 
-                        func(e, value, row, index);
+                        func.apply(this, [e, value, row, index]);
                     });
                 });
             }
@@ -1195,6 +1202,11 @@
     };
 
     BootstrapTable.prototype.updateSelected = function () {
+        var checkAll = this.$selectItem.filter(':enabled').length ===
+            this.$selectItem.filter(':enabled').filter(':checked').length;
+
+        this.$selectAll.add(this.$selectAll_).prop('checked', checkAll);
+
         this.$selectItem.each(function () {
             $(this).parents('tr')[$(this).prop('checked') ? 'addClass' : 'removeClass']('selected');
         });
@@ -1419,21 +1431,34 @@
     };
 
     BootstrapTable.prototype.checkAll = function () {
-        this.$selectAll.add(this.$selectAll_).prop('checked', true);
-        this.$selectItem.filter(':enabled').prop('checked', true);
-        this.updateRows(true);
-        this.updateSelected();
-        this.trigger('check-all');
+        this.checkAll_(true);
     };
 
     BootstrapTable.prototype.uncheckAll = function () {
-        this.$selectAll.add(this.$selectAll_).prop('checked', false);
-        this.$selectItem.filter(':enabled').prop('checked', false);
-        this.updateRows(false);
+        this.checkAll_(false);
+    };
+
+    BootstrapTable.prototype.checkAll_ = function (checked) {
+        this.$selectItem.filter(':enabled').prop('checked', checked);
+        this.updateRows(checked);
         this.updateSelected();
-        this.trigger('uncheck-all');
+        this.trigger(checked ? 'check-all' : 'uncheck-all');
+    }
+
+    BootstrapTable.prototype.check = function (index) {
+        this.check_(true, index);
     };
 
+    BootstrapTable.prototype.uncheck = function (index) {
+        this.check_(false, index);
+    };
+
+    BootstrapTable.prototype.check_ = function (checked, index) {
+        this.$selectItem.filter(sprintf('[data-index="%s"]', index)).prop('checked', checked);
+        this.data[index][this.header.stateField] = checked;
+        this.updateSelected();
+    }
+
     BootstrapTable.prototype.destroy = function () {
         this.$el.insertBefore(this.$container);
         $(this.options.toolbar).insertBefore(this.$el);
@@ -1484,6 +1509,16 @@
         }
     };
 
+    BootstrapTable.prototype.prevPage = function () {
+        this.options.pageNumber > 1 ? this.options.pageNumber-- : null;
+        this.updatePagination();
+    };
+
+    BootstrapTable.prototype.nextPage = function () {
+        this.options.pageNumber < this.options.pageSize ? this.options.pageNumber++ : null;
+        this.updatePagination();
+    };
+
     // BOOTSTRAP TABLE PLUGIN DEFINITION
     // =======================
 
@@ -1493,13 +1528,15 @@
         'updateRow',
         'mergeCells',
         'checkAll', 'uncheckAll',
+        'check', 'uncheck',
         'refresh',
         'resetView',
         'destroy',
         'showLoading', 'hideLoading',
         'showColumn', 'hideColumn',
         'filterBy',
-        'scrollTo'
+        'scrollTo',
+        'prevPage', 'nextPage'
     ];
 
     $.fn.bootstrapTable = function (option, _relatedTarget) {
@@ -1538,6 +1575,7 @@
     $.fn.bootstrapTable.Constructor = BootstrapTable;
     $.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS;
     $.fn.bootstrapTable.columnDefaults = BootstrapTable.COLUMN_DEFAULTS;
+    $.fn.bootstrapTable.locales = BootstrapTable.LOCALES;
     $.fn.bootstrapTable.methods = allowedMethods;
 
     // BOOTSTRAP TABLE INIT

+ 5 - 2
src/locale/bootstrap-table-cs-CZ.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['cs-CZ'] = {
         formatLoadingMessage: function () {
             return 'Čekejte, prosím…';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Nenalezena žádná vyhovující položka';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['cs-CZ']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-da-DK.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['da-DK'] = {
         formatLoadingMessage: function () {
             return 'Indlæser, vent venligst…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Kolonner';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['da-DK']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-de-DE.js

@@ -5,7 +5,7 @@
 (function ($) {
   'use strict';
 
-  $.extend($.fn.bootstrapTable.defaults, {
+  $.fn.bootstrapTable.locales['de-DE'] = {
     formatLoadingMessage: function () {
       return 'Lade, bitte warten…';
     },
@@ -30,5 +30,8 @@
     formatColumns: function () {
       return 'Spalten';
     }
-  });
+  };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['de-DE']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-el-GR.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['el-GR'] = {
         formatLoadingMessage: function () {
             return 'Φορτώνει, παρακαλώ περιμένετε…';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Δεν βρέθηκαν αποτελέσματα';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['el-GR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-en-US.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['en-US'] = {
         formatLoadingMessage: function () {
             return 'Loading, please wait…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Columns';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['en-US']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-en-US.js.template

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['en-US'] = {
         formatLoadingMessage: function () {
             return 'Loading, please wait…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Columns';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['en-US']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-es-AR.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['es-AR'] = {
         formatLoadingMessage: function () {
             return 'Cargando, espere por favor...';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'No se encontraron registros';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-AR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-es-CR.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['es-CR'] = {
         formatLoadingMessage: function () {
             return 'Cargando, por favor espere...';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Columnas';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-CR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-es-NI.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['es-NI'] = {
         formatLoadingMessage: function () {
             return 'Cargando, por favor espere...';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Columnas';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-NI']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-fr-BE.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['fr-BE'] = {
         formatLoadingMessage: function () {
             return 'Chargement en cours...';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Pas de fichiers trouvés';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fr-BE']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-fr-FR.js

@@ -6,7 +6,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['fr-FR'] = {
         formatLoadingMessage: function () {
             return 'Chargement en cours, patientez, s´il vous plaît ...';
         },
@@ -31,5 +31,8 @@
         formatColumns: function () {
             return 'Colonnes';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fr-FR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-hu-HU.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['hu-HU'] = {
         formatLoadingMessage: function () {
             return 'Betöltés, kérem várjon…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Oszlopok';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['hu-HU']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-it-IT.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['it-IT'] = {
         formatLoadingMessage: function () {
             return 'Caricamento in corso…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Colonne';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['it-IT']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-ko-KR.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['ko-KR'] = {
         formatLoadingMessage: function () {
             return '데이터를 불러오는 중입니다...';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return '컬럼 필터링';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['ko-KR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-nl-NL.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['nl-NL'] = {
         formatLoadingMessage: function () {
             return 'Laden, even geduld…';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Geen resultaten gevonden';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['nl-NL']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-pl-PL.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['pl-PL'] = {
         formatLoadingMessage: function () {
             return 'Ładowanie, proszę czekać…';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'Kolumny';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['pl-PL']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-pt-BR.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['pt-BR'] = {
         formatLoadingMessage: function () {
             return 'Carregando, aguarde…';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Nenhum registro encontrado';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['pt-BR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-ru-RU.js

@@ -4,7 +4,7 @@
  */
 (function ($) {
     'use strict';
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['ru-RU'] = {
         formatLoadingMessage: function () {
             return 'Пожалуйста, подождите, идёт загрузка...';
         },
@@ -29,5 +29,8 @@
         formatColumns: function () {
             return 'Колонки';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['ru-RU']);
+
 })(jQuery);

+ 37 - 0
src/locale/bootstrap-table-sk-SK.js

@@ -0,0 +1,37 @@
+/**
+ * Bootstrap Table Slovak translation
+ * Author: Jozef Dúc<jozef.d13@gmail.com>
+ */
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['sk-SK'] = {
+        formatLoadingMessage: function () {
+            return 'Prosím čakajte …';
+        },
+        formatRecordsPerPage: function (pageNumber) {
+            return pageNumber + ' záznamov na stranu';
+        },
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
+            return 'Zobrazená ' + pageFrom + '. - ' + pageTo + '. položka z celkových ' + totalRows;
+        },
+        formatSearch: function () {
+            return 'Vyhľadávanie';
+        },
+        formatNoMatches: function () {
+            return 'Nenájdená žiadne vyhovujúca položka';
+        },
+        formatRefresh: function () {
+            return 'Obnoviť';
+        },
+        formatToggle: function () {
+            return 'Prepni';
+        },
+        formatColumns: function () {
+            return 'Stĺpce';
+        }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sk-SK']);
+
+})(jQuery);

+ 14 - 21
src/locale/bootstrap-table-th-TH.js

@@ -2,43 +2,36 @@
  * Bootstrap Table Thai translation
  * Author: Monchai S.<monchais@gmail.com>
  */
-(function ($) 
-{
+(function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, 
-    {
-        formatLoadingMessage: function () 
-        {
+    $.fn.bootstrapTable.locales['th-TH'] = {
+        formatLoadingMessage: function () {
             return 'กำลังโหลดข้อมูล, กรุณารอสักครู่...';
         },
-        formatRecordsPerPage: function (pageNumber) 
-        {
+        formatRecordsPerPage: function (pageNumber) {
             return pageNumber + ' รายการต่อหน้า';
         },
-        formatShowingRows: function (pageFrom, pageTo, totalRows) 
-        {
+        formatShowingRows: function (pageFrom, pageTo, totalRows) {
             return 'รายการที่ ' + pageFrom + ' ถึง ' + pageTo + ' จากทั้งหมด ' + totalRows + ' รายการ';
         },
-        formatSearch: function () 
-        {
+        formatSearch: function () {
             return 'ค้นหา';
         },
-        formatNoMatches: function () 
-        {
+        formatNoMatches: function () {
             return 'ไม่พบรายการที่ค้นหา !';
         },
-        formatRefresh: function () 
-        {
+        formatRefresh: function () {
             return 'รีเฟรส';
         },
-        formatToggle: function () 
-        {
+        formatToggle: function () {
             return 'สลับมุมมอง';
         },
-        formatColumns: function () 
-        {
+        formatColumns: function () {
             return 'คอลัมน์';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['th-TH']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-tr-TR.js

@@ -6,7 +6,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['tr-TR'] = {
         formatLoadingMessage: function () {
             return 'Yükleniyor, lütfen bekleyin…';
         },
@@ -31,5 +31,8 @@
         formatColumns: function () {
             return 'Sütunlar';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['tr-TR']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-ur-PK.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['ur-PK'] = {
         formatLoadingMessage: function () {
             return 'براۓ مہربانی انتظار کیجئے';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return 'کالم';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['ur-PK']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-vi-VN.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['vi-VN'] = {
         formatLoadingMessage: function () {
             return 'Đang tải...';
         },
@@ -21,5 +21,8 @@
         formatNoMatches: function () {
             return 'Không có dữ liệu';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['vi-VN']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-zh-CN.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['zh-CN'] = {
         formatLoadingMessage: function () {
             return '正在努力地加载数据中,请稍候……';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return '列';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
+
 })(jQuery);

+ 5 - 2
src/locale/bootstrap-table-zh-TW.js

@@ -5,7 +5,7 @@
 (function ($) {
     'use strict';
 
-    $.extend($.fn.bootstrapTable.defaults, {
+    $.fn.bootstrapTable.locales['zh-TW'] = {
         formatLoadingMessage: function () {
             return '正在努力地載入資料,請稍候……';
         },
@@ -30,5 +30,8 @@
         formatColumns: function () {
             return '列';
         }
-    });
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-TW']);
+
 })(jQuery);