From 29771aee5c1e0672a4c346b990892c18e8625648 Mon Sep 17 00:00:00 2001 From: Sven Baumann Date: Fri, 18 Nov 2022 09:35:04 +0100 Subject: [PATCH 1/2] Adapt branch alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c7c0860..932b63e 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ "extra": { "contao-manager-plugin": "MetaModels\\AttributeSelectBundle\\ContaoManager\\Plugin", "branch-alias": { - "dev-feature/2.2.0": "2.2.x-dev" + "dev-hotfix/2.2.1": "2.2.1-dev" } }, "config": { From 3fdc46771f233138e6ebeaf5e2020b09798c0faf Mon Sep 17 00:00:00 2001 From: Mini Model Date: Sat, 19 Nov 2022 17:56:43 +0100 Subject: [PATCH 2/2] Updated translations from transifex. --- .../languages/de/tl_metamodel_attribute.php | 12 ++++-- .../languages/el/tl_metamodel_attribute.php | 35 ++++++++++++------ .../languages/et/tl_metamodel_attribute.php | 25 ++++++++++--- .../languages/fr/tl_metamodel_attribute.php | 25 +++++++++---- .../languages/it/tl_metamodel_attribute.php | 37 ++++++++++++------- .../languages/rm/tl_metamodel_attribute.php | 37 ++++++++++++------- .../languages/ru/tl_metamodel_attribute.php | 27 ++++++++++---- 7 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/Resources/contao/languages/de/tl_metamodel_attribute.php b/src/Resources/contao/languages/de/tl_metamodel_attribute.php index 96c659e..c36e7ba 100644 --- a/src/Resources/contao/languages/de/tl_metamodel_attribute.php +++ b/src/Resources/contao/languages/de/tl_metamodel_attribute.php @@ -2,7 +2,7 @@ /** * This file is part of MetaModels/attribute_select. * - * (c) 2012-2020 The MetaModels team. + * (c) 2012-2022 The MetaModels team. * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -12,9 +12,9 @@ * Translations are managed automatically using Transifex. To create a new translation * or to help to maintain an existing one, please register at transifex.com. * - * Last-updated: 2020-02-16T16:16:31+01:00 + * Last-updated: 2022-11-19T17:56:32+01:00 * - * @copyright 2012-2020 The MetaModels team. + * @copyright 2012-2022 The MetaModels team. * @license https://github.com/MetaModels/attribute_select/blob/master/LICENSE LGPL-3.0-or-later * @link https://www.transifex.com/metamodels/public/ * @link https://www.transifex.com/signup/?join_project=metamodels @@ -33,6 +33,10 @@ $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_filterparams']['1'] = 'Hier können Sie eine Vorgabe für den Filter wählen..'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_id']['0'] = 'ID-Spalte'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_id']['1'] = 'Bitte wählen Sie die Tabellenspalte aus, die als Datensatz-ID dienen soll.'; +$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sort']['0'] = 'Sortierrichtung'; +$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sort']['1'] = 'Richtung der Sortierung.'; +$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sort_directions']['ASC'] = 'Aufsteigend'; +$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sort_directions']['DESC'] = 'Absteigend'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sorting']['0'] = 'Auswahl-Sortierung'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_sorting']['1'] = 'Bitte wählen Sie einen Eintrag für die Tag-Sortierung aus.'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_table']['0'] = 'Quelltabelle'; @@ -41,7 +45,7 @@ $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_table_type']['translated'] = 'Übersetztes MetaModels'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_table_type']['untranslated'] = 'Unübersetztes MetaModels'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_where']['0'] = 'SQL'; -$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_where']['1'] = 'Die Auswahlmöglichkeiten können per SQL eingeschränkt werden.'; +$GLOBALS['TL_LANG']['tl_metamodel_attribute']['select_where']['1'] = 'Die Liste der Optionen kann durch Verwendung von SQL als WHERE-Bedingung eingeschränkt werden - verwenden Sie den Alias \'sourceTable\' für die Quelltabelle.'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['sql_error'] = 'Die SQL-Abfrage verursacht einen Fehler.'; $GLOBALS['TL_LANG']['tl_metamodel_attribute']['typeOptions']['select'] = 'Einzelauswahl [select]'; diff --git a/src/Resources/contao/languages/el/tl_metamodel_attribute.php b/src/Resources/contao/languages/el/tl_metamodel_attribute.php index 9c93d3a..cf4c37e 100644 --- a/src/Resources/contao/languages/el/tl_metamodel_attribute.php +++ b/src/Resources/contao/languages/el/tl_metamodel_attribute.php @@ -1,20 +1,31 @@