From 629566546ad3474c54189b37f03de92d7c6d6a5b Mon Sep 17 00:00:00 2001 From: Arthur Lutkevichus Date: Wed, 19 Nov 2014 10:35:09 +0200 Subject: [PATCH 1/4] Broken output fix Incorrect usage of ` ` --- pagination/select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pagination/select.js b/pagination/select.js index 264479c..ae810f9 100644 --- a/pagination/select.js +++ b/pagination/select.js @@ -89,7 +89,7 @@ $.fn.dataTableExt.oPagination.listbox = { elSel.add(oOption); // IE only } } - spans[1].innerHTML = " nbsp;of nbsp;" + iPages; + spans[1].innerHTML = " of " + iPages; } elSel.value = iCurrentPage; } From 6b976aaedd23eef466ee290157f52edcffe1493a Mon Sep 17 00:00:00 2001 From: jgacuca567 Date: Sun, 23 Nov 2014 20:56:58 -0500 Subject: [PATCH 2/4] index.html Made Changes to Doctype as well as Foundation, updated to 5.4.7 --- integration/foundation/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/foundation/index.html b/integration/foundation/index.html index 159436f..2a413fe 100644 --- a/integration/foundation/index.html +++ b/integration/foundation/index.html @@ -1,11 +1,11 @@ - + DataTables Foundation example - + @@ -442,4 +442,4 @@ - \ No newline at end of file + From 81e9b708683da285b44afcede730f7beae9e69f9 Mon Sep 17 00:00:00 2001 From: Zachary Date: Thu, 4 Dec 2014 15:21:17 -0800 Subject: [PATCH 3/4] Allowing Bootstrap to determine button text color --- integration/bootstrap/3/dataTables.bootstrap.css | 1 - 1 file changed, 1 deletion(-) diff --git a/integration/bootstrap/3/dataTables.bootstrap.css b/integration/bootstrap/3/dataTables.bootstrap.css index faee0e5..7f4b8e3 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.css +++ b/integration/bootstrap/3/dataTables.bootstrap.css @@ -175,7 +175,6 @@ table.DTTT_selectable tbody tr { } div.DTTT .btn { - color: #333 !important; font-size: 12px; } From 99793bba2fbaeb5006c9752ee94a587b17a8c923 Mon Sep 17 00:00:00 2001 From: Alexander Pyatkin Date: Thu, 11 Dec 2014 11:45:42 +0400 Subject: [PATCH 4/4] Update Russian lang file for DataTables >= 1.10 1. As it said in DataTables blog, camelCase notation is preferred over Hungarian one from 1.10. 2. Previous translation doesn't contain loadingRecords (or sLoadingRecords) translation P.S. Really don't like vertically aligned lines --- i18n/Russian.lang | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/i18n/Russian.lang b/i18n/Russian.lang index b3f3d2e..032b17a 100644 --- a/i18n/Russian.lang +++ b/i18n/Russian.lang @@ -3,26 +3,28 @@ * @name Russian * @anchor Russian * @author Tjoma + * @autor aspyatkin */ { - "sProcessing": "Подождите...", - "sLengthMenu": "Показать _MENU_ записей", - "sZeroRecords": "Записи отсутствуют.", - "sInfo": "Записи с _START_ до _END_ из _TOTAL_ записей", - "sInfoEmpty": "Записи с 0 до 0 из 0 записей", - "sInfoFiltered": "(отфильтровано из _MAX_ записей)", - "sInfoPostFix": "", - "sSearch": "Поиск:", - "sUrl": "", - "oPaginate": { - "sFirst": "Первая", - "sPrevious": "Предыдущая", - "sNext": "Следующая", - "sLast": "Последняя" - }, - "oAria": { - "sSortAscending": ": активировать для сортировки столбца по возрастанию", - "sSortDescending": ": активировать для сортировки столбцов по убыванию" - } + "processing": "Подождите...", + "search": "Поиск:", + "lengthMenu": "Показать _MENU_ записей", + "info": "Записи с _START_ до _END_ из _TOTAL_ записей", + "infoEmpty": "Записи с 0 до 0 из 0 записей", + "infoFiltered": "(отфильтровано из _MAX_ записей)", + "infoPostFix": "", + "loadingRecords": "Загрузка записей...", + "zeroRecords": "Записи отсутствуют.", + "emptyTable:": "В таблице отсутствуют данные", + "paginate": { + "first": "Первая", + "previous": "Предыдущая", + "next": "Следующая", + "last": "Последняя" + }, + "aria": { + "sortAscending": ": активировать для сортировки столбца по возрастанию", + "sortDescending": ": активировать для сортировки столбца по убыванию" + } }