Skip to content

Commit 72bc935

Browse files
committed
Add i18n support.
1 parent 88dbacd commit 72bc935

File tree

2 files changed

+39
-19
lines changed

2 files changed

+39
-19
lines changed

src/bootstrap-table.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.fixed-table-container {
99
position: relative;
1010
padding-top: 38px;
11+
clear: both;
1112
border: 1px solid #dddddd;
1213
border-radius: 4px;
1314
-webkit-border-radius: 4px;
@@ -87,15 +88,20 @@
8788
line-height: 34px;
8889
}
8990

91+
.fixed-table-toolbar .page-list {
92+
position: relative;
93+
float: left;
94+
}
95+
9096
.fixed-table-toolbar .page-list,
9197
.fixed-table-toolbar .search {
9298
margin-top: 10px;
9399
margin-bottom: 10px;
94100
line-height: 34px;
95101
}
96102

97-
.fixed-table-toolbar .page-list span {
98-
margin-left: 5px;
103+
.fixed-table-toolbar .page-list button {
104+
margin: 0 5px;
99105
}
100106

101107
.fixed-table-pagination li.disabled a {

src/bootstrap-table.js

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @author zhixin wen <wenzhixin2010@gmail.com>
3-
* version: 1.0.1
3+
* version: 1.0.2
44
*/
55

66
!function ($) {
@@ -63,6 +63,16 @@
6363
search: false,
6464
selectItemName: 'btSelectItem',
6565

66+
formatRecordsPerPage: function(pageNumber) {
67+
return sprintf('%s records per page', pageNumber);
68+
},
69+
formatShowingRows: function(pageFrom, pageTo, totalRows) {
70+
return sprintf('Showing %s to %s of %s rows', pageFrom, pageTo, totalRows);
71+
},
72+
formatSearch: function() {
73+
return 'Search';
74+
},
75+
6676
onClickRow: function(item) {return false;},
6777
onSort: function(name, order) {return false;},
6878
onCheck: function(row) {return false;},
@@ -242,23 +252,25 @@
242252

243253
if (this.options.pagination) {
244254
html = [];
245-
html.push(
246-
'<div class="btn-group page-list">',
247-
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
248-
'<span class="page-size">',
249-
this.options.pageSize,
250-
'</span>',
251-
' <span class="caret"></span>',
252-
'</button>',
253-
'<ul class="dropdown-menu" role="menu">');
255+
html.push('<div class="page-list">');
256+
257+
var pageNumber = [
258+
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
259+
'<span class="page-size">',
260+
this.options.pageSize,
261+
'</span>',
262+
' <span class="caret"></span>',
263+
'</button>',
264+
'<ul class="dropdown-menu" role="menu">'];
265+
254266
$.each(this.options.pageList, function(i, page) {
255267
var active = page === that.options.pageSize ? ' class="active"' : '';
256-
html.push(sprintf('<li%s><a href="javascript:void(0)">%s</a></li>', active, page));
268+
pageNumber.push(sprintf('<li%s><a href="javascript:void(0)">%s</a></li>', active, page));
257269
});
258-
html.push(
259-
'</ul>',
260-
'<span>records per page</span>',
261-
'</div>');
270+
pageNumber.push('</ul>');
271+
272+
html.push(this.options.formatRecordsPerPage(pageNumber.join('')));
273+
html.push('</div>');
262274

263275
this.$toolbar.append(html.join(''));
264276
$pageList = this.$toolbar.find('.page-list a');
@@ -269,7 +281,8 @@
269281
html = [];
270282
html.push(
271283
'<div class="pull-right search">',
272-
'<input class="form-control" type="text" placeholder="Search">',
284+
sprintf('<input class="form-control" type="text" placeholder="%s">',
285+
this.options.formatSearch()),
273286
'</div>');
274287

275288
this.$toolbar.append(html.join(''));
@@ -327,7 +340,7 @@
327340
html.push(
328341
'<div class="pull-left pagination">',
329342
'<div class="pagination-info">',
330-
sprintf('Showing %s to %s of %s rows', this.pageFrom, this.pageTo, this.options.totalRows),
343+
this.options.formatShowingRows(this.pageFrom, this.pageTo, this.options.totalRows),
331344
'</div>',
332345
'</div>',
333346
'<div class="pull-right">',
@@ -651,6 +664,7 @@
651664
};
652665

653666
$.fn.bootstrapTable.Constructor = BootstrapTable;
667+
$.fn.bootstrapTable.defaults = BootstrapTable.DEFAULTS;
654668

655669
// BOOTSTRAP TABLE INIT
656670
// =======================

0 commit comments

Comments
 (0)