Merge branch 'hotfix/2.1.1'

MetaModels · Jan 14, 2020 · 9118cbe · 9118cbe
2 parents f11c841 + a0da63a
commit 9118cbe
Show file tree

Hide file tree

Showing 11 changed files with 207 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ php:
   - "7.1"
 
 env:
+  - CONTAO_VERSION=~4.8.0
   - CONTAO_VERSION=~4.7.0
   - CONTAO_VERSION=~4.6.0
   - CONTAO_VERSION=~4.5.0
@@ -23,6 +24,7 @@ matrix:
   exclude:
   fast_finish: true
   allow_failures:
+    - env: CONTAO_VERSION=~4.8.0
     - env: CONTAO_VERSION=~4.7.0
     - env: CONTAO_VERSION=~4.6.0
     - env: CONTAO_VERSION=~4.5.0

diff --git a/composer.json b/composer.json
@@ -1,65 +1,65 @@
 {
-  "name": "metamodels/contao-frontend-editing",
-  "description": "MetaModels frontend editing integrations",
-  "keywords": [
-    "contao",
-    "metamodels",
-    "frontend-editing"
-  ],
-  "type": "contao-bundle",
-  "homepage": "http://now.metamodel.me/",
-  "license": "LGPL-3.0-or-later",
-  "authors": [
-    {
-      "name": "Christian Schiffler",
-      "email": "[email protected]",
-      "homepage": "http://www.cyberspectrum.de",
-      "role": "Developer"
+    "name": "metamodels/contao-frontend-editing",
+    "description": "MetaModels frontend editing integrations",
+    "keywords": [
+        "contao",
+        "metamodels",
+        "frontend-editing"
+    ],
+    "type": "contao-bundle",
+    "homepage": "http://now.metamodel.me/",
+    "license": "LGPL-3.0-or-later",
+    "authors": [
+        {
+            "name": "Christian Schiffler",
+            "email": "[email protected]",
+            "homepage": "http://www.cyberspectrum.de",
+            "role": "Developer"
+        },
+        {
+            "name": "Stefan Heimes",
+            "email": "[email protected]",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "[email protected]",
+        "issues": "https://github.com/MetaModels/contao-frontend-editing/issues",
+        "wiki": "http://de.contaowiki.org/MetaModels",
+        "irc": "irc://irc.freenode.org/contao.mm",
+        "source": "https://github.com/MetaModels/contao-frontend-editing"
     },
-    {
-      "name": "Stefan Heimes",
-      "email": "[email protected]",
-      "role": "Developer"
-    }
-  ],
-  "support": {
-    "email": "[email protected]",
-    "issues": "https://github.com/MetaModels/contao-frontend-editing/issues",
-    "wiki": "http://de.contaowiki.org/MetaModels",
-    "irc": "irc://irc.freenode.org/contao.mm",
-    "source": "https://github.com/MetaModels/contao-frontend-editing"
-  },
-  "require": {
-    "php": "^7.1",
-    "contao-community-alliance/dc-general": "^2.1.3",
-    "contao-community-alliance/dc-general-contao-frontend": "~2.1@dev",
-    "contao-community-alliance/url-builder": "~1.1",
-    "contao/core-bundle": "^4.4.8",
-    "menatwork/contao-multicolumnwizard-bundle": "^3.4",
-    "metamodels/core": "~2.1@dev"
-  },
-  "require-dev": {
-    "contao/manager-plugin": "^2.1",
-    "phpcq/all-tasks": "^1.2"
-  },
-  "autoload": {
-    "psr-4": {
-      "MetaModels\\ContaoFrontendEditingBundle\\": "src"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "MetaModels\\ContaoFrontendEditingBundle\\Test\\": "tests"
-    }
-  },
-  "extra": {
-    "contao-manager-plugin": "MetaModels\\ContaoFrontendEditingBundle\\ContaoManager\\Plugin",
-    "branch-alias": {
-      "dev-master": "2.1.x-dev",
-      "dev-support/2.0": "2.0.x-dev"
+    "require": {
+        "php": "^7.1",
+        "contao-community-alliance/dc-general": "^2.1.5",
+        "contao-community-alliance/dc-general-contao-frontend": "^2.1",
+        "contao-community-alliance/url-builder": "^1.3",
+        "contao/core-bundle": "^4.4.8",
+        "menatwork/contao-multicolumnwizard-bundle": "^3.4",
+        "metamodels/core": "^2.1"
+    },
+    "require-dev": {
+        "contao/manager-plugin": "^2.1",
+        "phpcq/all-tasks": "^1.2"
+    },
+    "autoload": {
+        "psr-4": {
+            "MetaModels\\ContaoFrontendEditingBundle\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "MetaModels\\ContaoFrontendEditingBundle\\Test\\": "tests"
+        }
+    },
+    "extra": {
+        "contao-manager-plugin": "MetaModels\\ContaoFrontendEditingBundle\\ContaoManager\\Plugin",
+        "branch-alias": {
+            "dev-master": "2.1.x-dev",
+            "dev-support/2.0": "2.0.x-dev"
+        }
+    },
+    "config": {
+        "sort-packages": true
     }
-  },
-  "config": {
-    "sort-packages": true
-  }
 }
diff --git a/src/Resources/contao/languages/de/default.php b/src/Resources/contao/languages/de/default.php
@@ -1,16 +1,29 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/de/
+ * This project is provided in good faith and hope to be usable by anyone.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * 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-01-13T18:19:38+01:00
  *
- * last-updated: 2016-12-21T22:29:54+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
-$GLOBALS['TL_LANG']['MSC']['metamodel_add_item']  = 'Datensatz hinzufügen';
-$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item'] = 'Datensatz bearbeiten';
+
+$GLOBALS['TL_LANG']['MSC']['metamodel_add_item']       = 'Datensatz hinzufügen';
+$GLOBALS['TL_LANG']['MSC']['metamodel_copy_item']      = 'Datensatz kopieren';
+$GLOBALS['TL_LANG']['MSC']['metamodel_create_variant'] = 'Variante erstellen';
+$GLOBALS['TL_LANG']['MSC']['metamodel_delete_item']    = 'Datensatz löschen';
+$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item']      = 'Datensatz bearbeiten';
 
diff --git a/src/Resources/contao/languages/de/tl_content.php b/src/Resources/contao/languages/de/tl_content.php
@@ -1,19 +1,29 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/de/
+ * This project is provided in good faith and hope to be usable by anyone.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * 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-01-13T18:19:46+01:00
  *
- * last-updated: 2016-12-22T00:17:39+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
+
 $GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing']['0']      = 'Frontend-Bearbeitung aktivieren';
-$GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing']['1']      = 'Falls aktiviert können Frontend-Benutzer Datensätze des ausgewählten MetaModels bearbeiten.';
+$GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing']['1']      = 'Falls aktiviert, können Frontend-Benutzer Datensätze des ausgewählten MetaModels bearbeiten.';
 $GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing_page']['0'] = 'Editor-Seite';
-$GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing_page']['1'] = 'Wählen Sie die Seite aus auf der der Editor eingebunden ist. URLs zum bearbeiten und hinzufügen werden dann auf diese Seite leiten.';
+$GLOBALS['TL_LANG']['tl_content']['metamodel_fe_editing_page']['1'] = 'Wählen Sie die Seite aus, auf der der Editor eingebunden ist. URLs zum bearbeiten und hinzufügen werden dann auf diese Seite leiten.';
 $GLOBALS['TL_LANG']['tl_content']['mm_editing_legend']              = 'MetaModels Frontend Bearbeitung';
 
diff --git a/src/Resources/contao/languages/de/tl_module.php b/src/Resources/contao/languages/de/tl_module.php
@@ -1,19 +1,29 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/de/
+ * This project is provided in good faith and hope to be usable by anyone.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * 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-01-13T18:19:50+01:00
  *
- * last-updated: 2016-12-22T00:17:39+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
+
 $GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing']['0']      = 'Frontend-Bearbeitung aktivieren';
-$GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing']['1']      = 'Falls aktiviert können Frontend-Benutzer Datensätze des ausgewählten MetaModels bearbeiten.';
+$GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing']['1']      = 'Falls aktiviert, können Frontend-Benutzer Datensätze des ausgewählten MetaModels bearbeiten.';
 $GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing_page']['0'] = 'Editor-Seite';
-$GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing_page']['1'] = 'Wählen Sie die Seite aus auf der der Editor eingebunden ist. URLs zum bearbeiten und hinzufügen werden dann auf diese Seite leiten.';
+$GLOBALS['TL_LANG']['tl_module']['metamodel_fe_editing_page']['1'] = 'Wählen Sie die Seite aus, auf der der Editor eingebunden ist. URLs zum bearbeiten und hinzufügen werden dann auf diese Seite leiten.';
 $GLOBALS['TL_LANG']['tl_module']['mm_editing_legend']              = 'MetaModels Frontend Bearbeitung';
 
diff --git a/src/Resources/contao/languages/el/default.php b/src/Resources/contao/languages/el/default.php
@@ -1,16 +1,27 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/el/
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Last-updated: 2020-01-13T18:19:38+01:00
  *
- * last-updated: 2016-12-21T22:29:51+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
 
-$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item'] = 'Επεξεργασια στοιχειου';
+$GLOBALS['TL_LANG']['MSC']['metamodel_copy_item']   = 'Αντιγραφη στιχειου';
+$GLOBALS['TL_LANG']['MSC']['metamodel_delete_item'] = 'Διαγραφη στοιχειου';
+$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item']   = 'Επεξεργασια στοιχειου';
 
diff --git a/src/Resources/contao/languages/et/default.php b/src/Resources/contao/languages/et/default.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of MetaModels/contao-frontend-editing.
  *
- * (c) 2012-2019 The MetaModels team.
+ * (c) 2012-2020 The MetaModels team.
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,15 +12,17 @@
  * 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: 2019-01-14T14:13:49+01:00
+ * Last-updated: 2020-01-13T18:19:38+01:00
  *
- * @copyright 2012-2019 The MetaModels team.
+ * @copyright 2012-2020 The MetaModels team.
  * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
  * @link      https://www.transifex.com/metamodels/public/
  * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
 
-$GLOBALS['TL_LANG']['MSC']['metamodel_add_item']  = 'Lisa kirje';
-$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item'] = 'Muuda kirjet';
+$GLOBALS['TL_LANG']['MSC']['metamodel_add_item']    = 'Lisa kirje';
+$GLOBALS['TL_LANG']['MSC']['metamodel_copy_item']   = 'Kopeeri kirje';
+$GLOBALS['TL_LANG']['MSC']['metamodel_delete_item'] = 'Kustuta kirje';
+$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item']   = 'Muuda kirjet';
 
diff --git a/src/Resources/contao/languages/fr/default.php b/src/Resources/contao/languages/fr/default.php
@@ -1,16 +1,27 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/fr/
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Last-updated: 2020-01-13T18:19:38+01:00
  *
- * last-updated: 2016-12-21T22:29:50+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
 
-$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item'] = 'Éditer l\'élément';
+$GLOBALS['TL_LANG']['MSC']['metamodel_copy_item']   = 'Copier l\'élément';
+$GLOBALS['TL_LANG']['MSC']['metamodel_delete_item'] = 'Supprimer l\'élément';
+$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item']   = 'Éditer l\'élément';
 
diff --git a/src/Resources/contao/languages/it/default.php b/src/Resources/contao/languages/it/default.php
@@ -1,16 +1,27 @@
 <?php
 /**
- * Translations are managed using Transifex. To create a new translation
- * or to help to maintain an existing one, please register at transifex.com.
+ * This file is part of MetaModels/contao-frontend-editing.
+ *
+ * (c) 2012-2020 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @link http://help.transifex.com/intro/translating.html
- * @link https://www.transifex.com/projects/p/metamodels/language/it/
+ * This project is provided in good faith and hope to be usable by anyone.
+ *
+ * Translations are managed automatically using Transifex. To create a new translation
+ * or to help to maintain an existing one, please register at transifex.com.
  *
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * Last-updated: 2020-01-13T18:19:38+01:00
  *
- * last-updated: 2016-12-21T22:29:51+01:00
+ * @copyright 2012-2020 The MetaModels team.
+ * @license   https://github.com/MetaModels/contao-frontend-editing/blob/master/LICENSE LGPL-3.0-or-later
+ * @link      https://www.transifex.com/metamodels/public/
+ * @link      https://www.transifex.com/signup/?join_project=metamodels
  */
 
 
-$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item'] = 'Modifica elemento';
+$GLOBALS['TL_LANG']['MSC']['metamodel_copy_item']   = 'Copia elemento';
+$GLOBALS['TL_LANG']['MSC']['metamodel_delete_item'] = 'Cancella elemento';
+$GLOBALS['TL_LANG']['MSC']['metamodel_edit_item']   = 'Modifica elemento';