Skip to content

Commit df0e3e6

Browse files
committed
Merge tag '2.0.2'
Hotfix release - Hotfix move URL parameter to section frontend filter - see MetaModels/core#1161 - Updated translations from transifex - Update PHP version and license
2 parents 41efb2c + c47d6ca commit df0e3e6

File tree

6 files changed

+54
-17
lines changed

6 files changed

+54
-17
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
language: php
22

33
php:
4-
- "5.4"
5-
- "5.5"
6-
- "5.6"
7-
- "7.0"
4+
- "7.2"
85
- "7.1"
6+
- "7.0"
7+
- "5.6"
98

109
env:
1110
- CONTAO_VERSION=~3.5.5
1211

1312
sudo: false
1413

14+
before_install:
15+
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16+
1517
install:
1618
- travis_retry composer self-update && composer --version
1719
- travis_retry composer require contao/core $CONTAO_VERSION --no-update

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"type": "contao-module",
1111
"homepage": "http://now.metamodel.me/",
12-
"license": "LGPL-3.0+",
12+
"license": "LGPL-3.0-or-later",
1313
"authors": [
1414
{
1515
"name": "Christian Schiffler",
@@ -31,10 +31,11 @@
3131
"source": "https://github.com/MetaModels/filter_checkbox"
3232
},
3333
"require": {
34-
"php": ">=5.4",
34+
"php": "^5.6 || ^7.0",
3535
"contao/core": "^3.5.5",
3636
"contao-community-alliance/composer-plugin": "~2.0",
37-
"metamodels/core": "~2.0"
37+
"contao-community-alliance/dc-general": "~2.0@beta",
38+
"metamodels/core": "~2.0@alpha"
3839
},
3940
"require-dev": {
4041
"cyberspectrum/contao-toolbox": "~0.6",
@@ -61,7 +62,5 @@
6162
"dev-master": "2.0.x-dev",
6263
"dev-develop": "2.1.x-dev"
6364
}
64-
},
65-
"minimum-stability": "dev",
66-
"prefer-stable": true
65+
}
6766
}

contao/dca/tl_metamodel_filtersetting.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This file is part of MetaModels/filter_checkbox.
55
*
6-
* (c) 2012-2016 The MetaModels team.
6+
* (c) 2012-2018 The MetaModels team.
77
*
88
* For the full copyright and license information, please view the LICENSE
99
* file that was distributed with this source code.
@@ -16,14 +16,14 @@
1616
* @author Andreas Isaak <info@andreas-isaak.de>
1717
* @author David Molineus <mail@netzmacht.de>
1818
* @author Christian de la Haye <service@delahaye.de>
19-
* @copyright 2012-2016 The MetaModels team.
20-
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0
19+
* @author Ingolf Steinhardt <info@e-spin.de>
20+
* @copyright 2012-2018 The MetaModels team.
21+
* @license https://github.com/MetaModels/filter_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2122
* @filesource
2223
*/
2324

24-
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+config'][] =
25+
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
2526
'urlparam';
26-
2727
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =
2828
'label';
2929
$GLOBALS['TL_DCA']['tl_metamodel_filtersetting']['metapalettes']['checkbox extends _attribute_']['+fefilter'][] =

contao/languages/et/default.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
/**
3+
* Translations are managed using Transifex. To create a new translation
4+
* or to help to maintain an existing one, please register at transifex.com.
5+
*
6+
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
7+
*
8+
* @link https://www.transifex.com/signup/
9+
* @link https://www.transifex.com/projects/p/$$project$$/language/$$lang$$/
10+
*
11+
* last-updated: 2018-03-08T09:48:39+01:00
12+
*/
13+
14+
15+
$GLOBALS['TL_LANG']['MSC']['extended_no'] = '%s: ei';
16+
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
/**
3+
* Translations are managed using Transifex. To create a new translation
4+
* or to help to maintain an existing one, please register at transifex.com.
5+
*
6+
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
7+
*
8+
* @link https://www.transifex.com/signup/
9+
* @link https://www.transifex.com/projects/p/$$project$$/language/$$lang$$/
10+
*
11+
* last-updated: 2018-03-08T09:48:42+01:00
12+
*/
13+
14+
15+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['no'] = 'Märkekast ei';
16+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['checkbox'] = 'Jah/Ei';
17+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['yes'] = 'Märkekast jah';
18+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield']['0'] = 'Omaduse nime asemel Jah/Ei';
19+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynmode']['1'] = 'Tee Jah/ei valitavaks';
20+

contao/languages/ru/tl_metamodel_filtersetting.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
*
99
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
1010
*
11-
* last-updated: 2015-07-11T08:02:14+02:00
11+
* last-updated: 2018-03-08T09:48:42+01:00
1212
*/
1313

1414
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['no'] = 'Чекбокс нет';
1515
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['radio'] = 'Выбор радио-кнопкой';
1616
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['checkbox'] = 'Да/нет';
1717
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['yes'] = 'Чекбокс да';
18-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield']['0'] = 'Да/нет вместо имени атрибута';
18+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield']['0'] = 'Да/нет вместо названия атрибута';
1919
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynfield']['1'] = 'Показать да/нет вместо имени атрибута и предоставить имя атрибута в качестве заголовка.';
2020
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynmode']['0'] = 'Модус';
2121
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['ynmode']['1'] = 'Сделать да/нет выбираемым';

0 commit comments

Comments
 (0)