Skip to content

Commit bfc007c

Browse files
discordierdiscordier
committed
Merge tag '2.0.5'
Maintenance release Updates the builds and code cleanup.
2 parents 1cbcddf + 7bbbefc commit bfc007c

21 files changed

+153
-157
lines changed

‎.check-author.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ignore:
2-
# Mini Model <minimodel@metamodel.me>
2+
- 'Mini Model <minimodel@metamodel.me>'
33

44
exclude:
5-
languages
5+
- /^contao\/languages/
66

77
mapping:
8-
Andreas Isaak <info@andreas-isaak.de>: Andreas Isaak <andy.jared@googlemail.com>
9-
Stefan Heimes <stefan_heimes@hotmail.com>: Stefan heimes <stefan_heimes@hotmail.com>
10-
Christopher Boelter <c.boelter@cogizz.de>: cogizz <c.boelter@cogizz.de>
8+
'Andreas Isaak <info@andreas-isaak.de>': 'Andreas Isaak <andy.jared@googlemail.com>'
9+
'Stefan Heimes <stefan_heimes@hotmail.com>': 'Stefan heimes <stefan_heimes@hotmail.com>'
10+
'Christopher Boelter <c.boelter@cogizz.de>': 'cogizz <c.boelter@cogizz.de>'

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ build.xml export-ignore
77
phpunit.xml.dist export-ignore
88
/.github export-ignore
99
/tests export-ignore
10+
ctb.json export-ignore

‎.travis.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1+
dist: xenial
2+
3+
addons:
4+
apt:
5+
packages:
6+
- ant-optional
7+
18
language: php
29

310
php:
11+
- "7.3"
412
- "7.2"
513
- "7.1"
614
- "7.0"
@@ -9,14 +17,19 @@ php:
917
env:
1018
- CONTAO_VERSION=~3.5.5
1119

12-
sudo: false
13-
14-
before_install:
15-
- echo "memory_limit = -1" > travis.php.ini && phpenv config-add travis.php.ini
16-
17-
install:
20+
before_script:
21+
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
1822
- travis_retry composer self-update && composer --version
1923
- travis_retry composer require contao/core $CONTAO_VERSION --no-update
24+
- >
25+
if [ "x${TRAVIS_TAG}" != "x" ]; then
26+
export COMPOSER_ROOT_VERSION=${TRAVIS_TAG}
27+
else
28+
export COMPOSER_ROOT_VERSION=$([[ ${TRAVIS_BRANCH} =~ hotfix/([0-9.]*(-(alpha|beta|rc)[0-9]+)?) ]] \
29+
&& echo ${BASH_REMATCH[1]} \
30+
|| echo dev-${TRAVIS_BRANCH})
31+
fi
32+
- echo "Using root version ${COMPOSER_ROOT_VERSION}"
2033
- travis_retry composer update --prefer-dist --no-interaction
2134

2235
script: ant -keep-going
@@ -25,6 +38,10 @@ script: ant -keep-going
2538
git:
2639
depth: 2147483647
2740

41+
branches:
42+
except:
43+
- /.*-translation/
44+
2845
cache:
2946
directories:
3047
- vendor

‎composer.json‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@
3333
},
3434
"require": {
3535
"php": "^5.6 || ^7.0",
36+
"contao-community-alliance/composer-plugin": "^2.4",
37+
"contao-community-alliance/dc-general": "^2.0.0",
3638
"contao/core": "^3.5.5",
37-
"contao-community-alliance/composer-plugin": "^2.0",
38-
"contao-community-alliance/dc-general": "^2.0@beta",
3939
"metamodels/core": "^2.0"
4040
},
4141
"require-dev": {
42-
"cyberspectrum/contao-toolbox": "^0.6",
4342
"phpcq/all-tasks": "^1.2"
4443
},
4544
"autoload": {
@@ -56,17 +55,14 @@
5655
"contao": {
5756
"symlinks": {
5857
"contao": "system/modules/metamodelsattribute_checkbox"
59-
},
60-
"transifex": {
61-
"project": "metamodels",
62-
"prefix": "attribute_checkbox-",
63-
"languages_cto": "contao/languages",
64-
"languages_tx": ".tx"
6558
}
6659
},
6760
"branch-alias": {
6861
"dev-master": "2.0.x-dev",
6962
"dev-develop": "2.1.x-dev"
7063
}
64+
},
65+
"config": {
66+
"sort-packages": true
7167
}
7268
}

‎contao/config/autoload.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 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.
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage AttributeCheckbox
13+
* @package MetaModels/attribute_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Andreas Isaak <info@andreas-isaak.de>
1716
* @author Sven Baumann <baumann.sv@gmail.com>
18-
* @copyright 2012-2018 The MetaModels team.
19-
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
17+
* @copyright 2012-2019 The MetaModels team.
18+
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2019
* @filesource
2120
*/
2221

‎contao/config/event_listeners.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2017 The MetaModels team.
6+
* (c) 2012-2019 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.
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage AttributeCheckbox
13+
* @package MetaModels/attribute_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Stefan Heimes <stefan_heimes@hotmail.com>
17-
* @copyright 2012-2017 The MetaModels team.
18-
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
16+
* @copyright 2012-2019 The MetaModels team.
17+
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
1918
* @filesource
2019
*/
2120

‎contao/dca/tl_metamodel_attribute.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 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.
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage AttributeCheckbox
13+
* @package MetaModels/attribute_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Andreas Isaak <info@andreas-isaak.de>
1716
* @author Christopher Boelter <c.boelter@cogizz.de>
1817
* @author David Maack <maack@men-at-work.de>
1918
* @author Stefan Heimes <stefan_heimes@hotmail.com>
2019
* @author Sven Baumann <baumann.sv@gmail.com>
2120
* @author Ingolf Steinhardt <info@e-spin.de>
22-
* @copyright 2012-2018 The MetaModels team.
21+
* @copyright 2012-2019 The MetaModels team.
2322
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2423
* @filesource
2524
*/

‎contao/dca/tl_metamodel_dcasetting.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 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.
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage AttributeCheckbox
13+
* @package MetaModels/attribute_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Andreas Isaak <info@andreas-isaak.de>
1716
* @author Stefan Heimes <stefan_heimes@hotmail.com>
1817
* @author Sven Baumann <baumann.sv@gmail.com>
1918
* @author Ingolf Steinhardt <info@e-spin.de>
20-
* @copyright 2012-2018 The MetaModels team.
19+
* @copyright 2012-2019 The MetaModels team.
2120
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2221
* @filesource
2322
*/

‎contao/dca/tl_metamodel_filtersetting.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
/**
44
* This file is part of MetaModels/attribute_checkbox.
55
*
6-
* (c) 2012-2018 The MetaModels team.
6+
* (c) 2012-2019 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.
1010
*
1111
* This project is provided in good faith and hope to be usable by anyone.
1212
*
13-
* @package MetaModels
14-
* @subpackage AttributeCheckbox
13+
* @package MetaModels/attribute_checkbox
1514
* @author Christian Schiffler <c.schiffler@cyberspectrum.de>
1615
* @author Andreas Isaak <info@andreas-isaak.de>
1716
* @author Ingolf Steinhardt <info@e-spin.de>
1817
* @author Sven Baumann <baumann.sv@gmail.com>
19-
* @copyright 2012-2018 The MetaModels team.
18+
* @copyright 2012-2019 The MetaModels team.
2019
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
2120
* @filesource
2221
*/

‎contao/languages/ru/tl_metamodel_attribute.php‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,28 @@
11
<?php
22
/**
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.
3+
* This file is part of MetaModels/attribute_checkbox.
4+
*
5+
* (c) 2012-2019 The MetaModels team.
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
59
*
6-
* @link http://help.transifex.com/intro/translating.html
7-
* @link https://www.transifex.com/projects/p/metamodels/language/ru/
10+
* This project is provided in good faith and hope to be usable by anyone.
811
*
9-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
12+
* Translations are managed automatically using Transifex. To create a new translation
13+
* or to help to maintain an existing one, please register at transifex.com.
14+
*
15+
* Last-updated: 2019-01-03T20:12:39+01:00
1016
*
11-
* last-updated: 2018-02-06T02:49:29+01:00
17+
* @copyright 2012-2019 The MetaModels team.
18+
* @license https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
19+
* @link https://www.transifex.com/metamodels/public/
20+
* @link https://www.transifex.com/signup/?join_project=metamodels
1221
*/
1322

23+
1424
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse']['0'] = 'Обратный';
25+
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse']['1'] = 'Если этот параметр выбран, опубликованный режим будет инвертирован (например, элементы контента).';
1526
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listview']['0'] = 'ListView чекбокс';
1627
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listview']['1'] = 'Если параметр выбран, вы получите дополнительный значок в панели управления listview.';
1728
$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listviewicon']['0'] = 'Значок ListView';

0 commit comments

Comments
 (0)