Skip to content

Commit ae3f6bf

Browse files
wenzhixinwenzhixin
committed
fix wenzhixin#2221: Release to 1.11.0
1 parent 78283b1 commit ae3f6bf

185 files changed

Lines changed: 3139 additions & 791 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dist/bootstrap-table-locale-all.js‎

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,12 @@
311311
},
312312
formatAllRows: function () {
313313
return 'All';
314+
},
315+
formatExport: function () {
316+
return 'Export data';
317+
},
318+
formatClearFilters: function () {
319+
return 'Clear filters';
314320
}
315321
};
316322

@@ -842,6 +848,7 @@
842848
* Bootstrap Table Italian translation
843849
* Author: Davide Renzi<davide.renzi@gmail.com>
844850
* Author: Davide Borsatto <davide.borsatto@gmail.com>
851+
* Author: Alessio Felicioni <alessio.felicioni@gmail.com>
845852
*/
846853
(function ($) {
847854
'use strict';
@@ -854,7 +861,7 @@
854861
return pageNumber + ' elementi per pagina';
855862
},
856863
formatShowingRows: function (pageFrom, pageTo, totalRows) {
857-
return 'Pagina ' + pageFrom + ' di ' + pageTo + ' (' + totalRows + ' records)';
864+
return 'Pagina ' + pageFrom + ' di ' + pageTo + ' (' + totalRows + ' elementi)';
858865
},
859866
formatSearch: function () {
860867
return 'Cerca';
@@ -870,6 +877,9 @@
870877
},
871878
formatColumns: function () {
872879
return 'Colonne';
880+
},
881+
formatAllRows: function () {
882+
return 'Tutto';
873883
}
874884
};
875885

@@ -1083,39 +1093,48 @@
10831093
* Bootstrap Table Dutch translation
10841094
* Author: Your Name <info@a2hankes.nl>
10851095
*/
1086-
(function ($) {
1096+
(function($) {
10871097
'use strict';
10881098

10891099
$.fn.bootstrapTable.locales['nl-NL'] = {
1090-
formatLoadingMessage: function () {
1100+
formatLoadingMessage: function() {
10911101
return 'Laden, even geduld...';
10921102
},
1093-
formatRecordsPerPage: function (pageNumber) {
1103+
formatRecordsPerPage: function(pageNumber) {
10941104
return pageNumber + ' records per pagina';
10951105
},
1096-
formatShowingRows: function (pageFrom, pageTo, totalRows) {
1106+
formatShowingRows: function(pageFrom, pageTo, totalRows) {
10971107
return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
10981108
},
1099-
formatDetailPagination: function (totalRows) {
1109+
formatDetailPagination: function(totalRows) {
11001110
return 'Toon ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
11011111
},
1102-
formatSearch: function () {
1112+
formatSearch: function() {
11031113
return 'Zoeken';
11041114
},
1105-
formatNoMatches: function () {
1115+
formatNoMatches: function() {
11061116
return 'Geen resultaten gevonden';
11071117
},
1108-
formatRefresh: function () {
1109-
return 'Vernieuwen';
1118+
formatRefresh: function() {
1119+
return 'Vernieuwen';
11101120
},
1111-
formatToggle: function () {
1112-
return 'Omschakelen';
1121+
formatToggle: function() {
1122+
return 'Omschakelen';
11131123
},
1114-
formatColumns: function () {
1115-
return 'Kolommen';
1124+
formatColumns: function() {
1125+
return 'Kolommen';
11161126
},
1117-
formatAllRows: function () {
1118-
return 'Alle';
1127+
formatAllRows: function() {
1128+
return 'Alle';
1129+
},
1130+
formatPaginationSwitch: function() {
1131+
return 'Verberg/Toon paginatie';
1132+
},
1133+
formatExport: function() {
1134+
return 'Exporteer data';
1135+
},
1136+
formatClearFilters: function() {
1137+
return 'Verwijder filters';
11191138
}
11201139
};
11211140

@@ -1212,19 +1231,34 @@
12121231

12131232
$.fn.bootstrapTable.locales['pt-PT'] = {
12141233
formatLoadingMessage: function () {
1215-
return 'A carregar, aguarde...';
1234+
return 'A carregar, por favor aguarde...';
12161235
},
12171236
formatRecordsPerPage: function (pageNumber) {
1218-
return pageNumber + ' registos por página';
1237+
return pageNumber + ' registos por p&aacute;gina';
12191238
},
12201239
formatShowingRows: function (pageFrom, pageTo, totalRows) {
1221-
return 'A mostrar ' + pageFrom + ' até ' + pageTo + ' de ' + totalRows + ' linhas';
1240+
return 'A mostrar ' + pageFrom + ' at&eacute; ' + pageTo + ' de ' + totalRows + ' linhas';
12221241
},
12231242
formatSearch: function () {
12241243
return 'Pesquisa';
12251244
},
12261245
formatNoMatches: function () {
12271246
return 'Nenhum registo encontrado';
1247+
},
1248+
formatPaginationSwitch: function () {
1249+
return 'Esconder/Mostrar pagina&ccedil&atilde;o';
1250+
},
1251+
formatRefresh: function () {
1252+
return 'Atualizar';
1253+
},
1254+
formatToggle: function () {
1255+
return 'Alternar';
1256+
},
1257+
formatColumns: function () {
1258+
return 'Colunas';
1259+
},
1260+
formatAllRows: function () {
1261+
return 'Tudo';
12281262
}
12291263
};
12301264

@@ -1609,12 +1643,19 @@
16091643
},
16101644
formatColumns: function () {
16111645
return '列';
1646+
},
1647+
formatExport: function () {
1648+
return '导出数据';
1649+
},
1650+
formatClearFilters: function () {
1651+
return '清空过滤';
16121652
}
16131653
};
16141654

16151655
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
16161656

16171657
})(jQuery);
1658+
16181659
/**
16191660
* Bootstrap Table Chinese translation
16201661
* Author: Zhixin Wen<wenzhixin2010@gmail.com>

‎dist/bootstrap-table-locale-all.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bootstrap-table.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @author zhixin wen <wenzhixin2010@gmail.com>
3-
* version: 1.10.1
3+
* version: 1.11.0
44
* https://github.com/wenzhixin/bootstrap-table/
55
*/
66

@@ -25,6 +25,10 @@
2525
border-right: 2px solid transparent;
2626
}
2727

28+
.bootstrap-table .table.table-no-bordered > tbody > tr > td:last-child {
29+
border-right: none;
30+
}
31+
2832
.fixed-table-container {
2933
position: relative;
3034
clear: both;
@@ -192,7 +196,7 @@
192196
line-height: 1.428571429;
193197
}
194198

195-
.fixed-table-toolbar .bars,
199+
.fixed-table-toolbar .bs-bars,
196200
.fixed-table-toolbar .search,
197201
.fixed-table-toolbar .columns {
198202
position: relative;

0 commit comments

Comments
 (0)