Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit c5133d6

Browse files
stephanvierkantstephanvierkant
committed
Merge branch 'master' into patch-9
2 parents 489637f + 6a19724 commit c5133d6

File tree

8 files changed

+74
-73
lines changed

8 files changed

+74
-73
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ cache:
99
matrix:
1010
fast_finish: true
1111
include:
12-
- php: 5.5
13-
- php: 5.6
14-
- php: 7.0
1512
- php: 7.1
1613
env: DEPENDENCIES=beta
1714
- php: hhvm
@@ -26,8 +23,7 @@ before_install:
2623
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
2724
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/framework-bundle=$SYMFONY_VERSION; fi
2825
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
29-
- if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then composer require --dev "phpunit/phpunit=4.8.*"; fi
30-
- if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." || ${TRAVIS_PHP_VERSION:0:2} == "hh" ]]; then composer require --dev "phpunit/phpunit=5.7.*"; fi
26+
- composer require --dev "phpunit/phpunit=5.7.*"
3127

3228
install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
3329

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Version 1.1.0
2+
3+
* Dropped support for PHP 5 and PHP 7.0. (#850)
4+
* Feature: Unique name to allow a datatable multiple times on the same page
5+
* Feature: Added the RowGroup extension (#769)
6+
* Bugfix: fixed Basque, Polish, Hebrew, Latvian and Russian translations (#760, #844, #846)
7+
* Other bugfixes

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# SgDatatablesBundle
22

3-
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/61803d08-17ab-4a69-ad13-6ec448762332/big.png)](https://insight.sensiolabs.com/projects/61803d08-17ab-4a69-ad13-6ec448762332)
4-
53
[![knpbundles.com](http://knpbundles.com/stwe/DatatablesBundle/badge)](http://knpbundles.com/stwe/DatatablesBundle)
64

75
[![Build Status](https://travis-ci.org/stwe/DatatablesBundle.svg?branch=master)](https://travis-ci.org/stwe/DatatablesBundle)

‎Resources/views/i18n/he.json.twig‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
* @author <a href="http://ww3.co.il/">Neil Osman (WW3)</a>
66
*/
77
{
8-
"processing": "מעבד...",
9-
"lengthMenu": "הצג _MENU_ פריטים",
10-
"zeroRecords": "לא נמצאו רשומות מתאימות",
11-
"emptyTable": "לא נמצאו רשומות מתאימות",
12-
"info": "_START_ עד _END_ מתוך _TOTAL_ רשומות" ,
13-
"infoEmpty": "0 עד 0 מתוך 0 רשומות",
14-
"infoFiltered": "(מסונן מסך _MAX_ רשומות)",
15-
"infoPostFix": "",
16-
"search": "חפש:",
8+
"sProcessing": "מעבד...",
9+
"sLengthMenu": "הצג _MENU_ פריטים",
10+
"sZeroRecords": "לא נמצאו רשומות מתאימות",
11+
"sEmptyTable": "לא נמצאו רשומות מתאימות",
12+
"sInfo": "_START_ עד _END_ מתוך _TOTAL_ רשומות" ,
13+
"sInfoEmpty": "0 עד 0 מתוך 0 רשומות",
14+
"sInfoFiltered": "(מסונן מסך _MAX_ רשומות)",
15+
"sInfoPostFix": "",
16+
"sSearch": "חפש:",
1717
"url": "",
18-
"paginate": {
19-
"first": "ראשון",
20-
"previous": "קודם",
21-
"next": "הבא",
22-
"last": "אחרון"
18+
"oPaginate": {
19+
"sFirst": "ראשון",
20+
"sPrevious": "קודם",
21+
"sNext": "הבא",
22+
"sLast": "אחרון"
2323
}
2424
}

‎Resources/views/i18n/lv.json.twig‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
* @author Oskars Podans and Ruslans Jermakovičs
66
*/
77
{
8-
"processing": "Uzgaidiet...",
9-
"search": "Meklēt:",
10-
"lengthMenu": "Rādīt _MENU_ ierakstus",
11-
"info": "Parādīti _START_. līdz _END_. no _TOTAL_ ierakstiem",
12-
"infoEmpty": "Nav ierakstu",
13-
"infoFiltered": "(atlasīts no pavisam _MAX_ ierakstiem)",
14-
"infoPostFix": "",
15-
"loadingRecords": "Iekraušanas ieraksti ...",
16-
"zeroRecords": "Nav atrasti vaicājumam atbilstoši ieraksti",
17-
"emptyTable:": "Tabula nav datu",
18-
"paginate": {
19-
"first": "Pirmā",
20-
"previous": "Iepriekšējā",
21-
"next": "Nākošā",
22-
"last": "Pēdējā"
8+
"sProcessing": "Uzgaidiet...",
9+
"sSearch": "Meklēt:",
10+
"sLengthMenu": "Rādīt _MENU_ ierakstus",
11+
"sInfo": "Parādīti _START_. līdz _END_. no _TOTAL_ ierakstiem",
12+
"sInfoEmpty": "Nav ierakstu",
13+
"sInfoFiltered": "(atlasīts no pavisam _MAX_ ierakstiem)",
14+
"sInfoPostFix": "",
15+
"sLoadingRecords": "Iekraušanas ieraksti ...",
16+
"sZeroRecords": "Nav atrasti vaicājumam atbilstoši ieraksti",
17+
"sEmptyTable:": "Tabula nav datu",
18+
"oPaginate": {
19+
"sFirst": "Pirmā",
20+
"sPrevious": "Iepriekšējā",
21+
"sNext": "Nākošā",
22+
"sLast": "Pēdējā"
2323
},
2424
"aria": {
25-
"sortAscending": ": aktivizēt kolonnu, lai kārtotu augošā",
26-
"sortDescending": ": aktivizēt kolonnu, lai kārtotu dilstošā"
25+
"sSortAscending": ": aktivizēt kolonnu, lai kārtotu augošā",
26+
"sSortDescending": ": aktivizēt kolonnu, lai kārtotu dilstošā"
2727
}
2828
}

‎Resources/views/i18n/pl.json.twig‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
* @author Michał Grzelak
77
*/
88
{
9-
"processing": "Przetwarzanie...",
10-
"search": "Szukaj:",
11-
"lengthMenu": "Pokaż _MENU_ pozycji",
12-
"info": "Pozycje od _START_ do _END_ z _TOTAL_ łącznie",
13-
"infoEmpty": "Pozycji 0 z 0 dostępnych",
14-
"infoFiltered": "(filtrowanie spośród _MAX_ dostępnych pozycji)",
15-
"infoPostFix": "",
16-
"loadingRecords": "Wczytywanie...",
17-
"zeroRecords": "Nie znaleziono pasujących pozycji",
18-
"emptyTable": "Brak danych",
19-
"paginate": {
20-
"first": "Pierwsza",
21-
"previous": "Poprzednia",
22-
"next": "Następna",
23-
"last": "Ostatnia"
9+
"sProcessing": "Przetwarzanie...",
10+
"sSearch": "Szukaj:",
11+
"sLengthMenu": "Pokaż _MENU_ pozycji",
12+
"sInfo": "Pozycje od _START_ do _END_, _TOTAL_ łącznie",
13+
"sInfoEmpty": "Pozycji 0 z 0 dostępnych",
14+
"sInfoFiltered": "(filtrowanie spośród _MAX_ dostępnych pozycji)",
15+
"sInfoPostFix": "",
16+
"sLoadingRecords": "Wczytywanie...",
17+
"sZeroRecords": "Nie znaleziono pasujących pozycji",
18+
"sEmptyTable": "Brak danych",
19+
"oPaginate": {
20+
"sFirst": "Pierwsza",
21+
"sPrevious": "Poprzednia",
22+
"sNext": "Następna",
23+
"sLast": "Ostatnia"
2424
},
2525
"aria": {
26-
"sortAscending": ": aktywuj, by posortować kolumnę rosnąco",
27-
"sortDescending": ": aktywuj, by posortować kolumnę malejąco"
26+
"sSortAscending": ": aktywuj, by posortować kolumnę rosnąco",
27+
"sSortDescending": ": aktywuj, by posortować kolumnę malejąco"
2828
}
2929
}

‎Resources/views/i18n/ru.json.twig‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
* @autor aspyatkin
77
*/
88
{
9-
"processing": "Подождите...",
10-
"search": "Поиск:",
11-
"lengthMenu": "Показать _MENU_ записей",
12-
"info": "Записи с _START_ до _END_ из _TOTAL_ записей",
13-
"infoEmpty": "Записи с 0 до 0 из 0 записей",
14-
"infoFiltered": "(отфильтровано из _MAX_ записей)",
15-
"infoPostFix": "",
16-
"loadingRecords": "Загрузка записей...",
17-
"zeroRecords": "Записи отсутствуют.",
18-
"emptyTable": "В таблице отсутствуют данные",
19-
"paginate": {
20-
"first": "Первая",
21-
"previous": "Предыдущая",
22-
"next": "Следующая",
23-
"last": "Последняя"
9+
"sProcessing": "Подождите...",
10+
"sSearch": "Поиск:",
11+
"sLengthMenu": "Показать _MENU_ записей",
12+
"sInfo": "Записи с _START_ до _END_ из _TOTAL_ записей",
13+
"sInfoEmpty": "Записи с 0 до 0 из 0 записей",
14+
"sInfoFiltered": "(отфильтровано из _MAX_ записей)",
15+
"sInfoPostFix": "",
16+
"sLoadingRecords": "Загрузка записей...",
17+
"sZeroRecords": "Записи отсутствуют.",
18+
"sEmptyTable": "В таблице отсутствуют данные",
19+
"oPaginate": {
20+
"sFirst": "Первая",
21+
"sPrevious": "Предыдущая",
22+
"sNext": "Следующая",
23+
"sLast": "Последняя"
2424
},
2525
"aria": {
26-
"sortAscending": ": активировать для сортировки столбца по возрастанию",
27-
"sortDescending": ": активировать для сортировки столбца по убыванию"
26+
"sSortAscending": ": активировать для сортировки столбца по возрастанию",
27+
"sSortDescending": ": активировать для сортировки столбца по убыванию"
2828
}
2929
}

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"issues": "https://github.com/stwe/DatatablesBundle/issues"
1919
},
2020
"require": {
21-
"php": ">=5.5.9",
21+
"php": ">=7.1",
2222
"symfony/framework-bundle": "^3.0|^4.0",
2323
"doctrine/orm": "^2.5",
2424
"symfony/options-resolver": "^3.0|^4.0",

0 commit comments

Comments
 (0)