[BUGFIX] Streamline and move labels for checkboxes 32/56832/3
authorFrank Naegler <frank.naegler@typo3.org>
Mon, 30 Apr 2018 17:30:40 +0000 (19:30 +0200)
committerAlexander Opitz <opitz.alexander@googlemail.com>
Wed, 2 May 2018 12:43:22 +0000 (14:43 +0200)
This patch is a followup patch for the checkbox toggle switch
changes. Labels are moved into correct positions and fixed in
case of a wrong reference.

Resolves: #84903
Releases: master
Change-Id: Ic32055b0c88b70cafe680379bf0a405eda0e685d
Reviewed-on: https://review.typo3.org/56832
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
typo3/sysext/core/Configuration/TCA/pages.php
typo3/sysext/core/Resources/Private/Language/locallang_tca.xlf
typo3/sysext/frontend/Resources/Private/Language/locallang_tca.xlf
typo3/sysext/sys_action/Configuration/TCA/sys_action.php

index 56d029a..214f7ba 100644 (file)
@@ -193,7 +193,7 @@ return [
         ],
         'hidden' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.hidden_toggle',
+            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:pages.hidden_toggle',
             'config' => [
                 'type' => 'check',
                 'renderType' => 'checkboxToggle',
@@ -367,7 +367,7 @@ return [
         'nav_hide' => [
             'exclude' => true,
             'l10n_mode' => 'prefixLangTitle',
-            'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.nav_hide_toggle',
+            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:pages.nav_hide_toggle',
             'config' => [
                 'type' => 'check',
                 'renderType' => 'checkboxToggle',
@@ -1104,7 +1104,7 @@ return [
         ],
         'visibility' => [
             'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.visibility',
-            'showitem' => 'hidden;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.hidden_toggle_formlabel, nav_hide;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.nav_hide_toggle_formlabel',
+            'showitem' => 'hidden;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:pages.hidden_toggle_formlabel, nav_hide;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:pages.nav_hide_toggle_formlabel',
         ],
         'hiddenonly' => [
             'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.visibility',
index 514d7a3..82b8882 100644 (file)
                        <trans-unit id="pages">
                                <source>Page</source>
                        </trans-unit>
+                       <trans-unit id="pages.hidden_toggle">
+                               <source>Page visible</source>
+                       </trans-unit>
+                       <trans-unit id="pages.hidden_toggle_formlabel">
+                               <source>Page visible</source>
+                       </trans-unit>
+                       <trans-unit id="pages.nav_hide_toggle">
+                               <source>Page enabled in menus</source>
+                       </trans-unit>
+                       <trans-unit id="pages.nav_hide_toggle_formlabel">
+                               <source>Page enabled in menus</source>
+                       </trans-unit>
                        <trans-unit id="doktype.I.0">
                                <source>Standard</source>
                        </trans-unit>
index 2fa6925..4a8ce65 100644 (file)
                        <trans-unit id="pages.hidden_checkbox_1_formlabel">
                                <source>Disable</source>
                        </trans-unit>
-                       <trans-unit id="pages.hidden_toggle">
-                               <source>Page visible</source>
-                       </trans-unit>
-                       <trans-unit id="pages.hidden_toggle_formlabel">
-                               <source>Page visible</source>
-                       </trans-unit>
                        <trans-unit id="pages.layout_formlabel">
                                <source>Frontend Layout</source>
                        </trans-unit>
                        <trans-unit id="pages.nav_hide_formlabel">
                                <source>In Menus</source>
                        </trans-unit>
-                       <trans-unit id="pages.nav_hide_toggle">
-                               <source>Page enabled in menus</source>
-                       </trans-unit>
-                       <trans-unit id="pages.nav_hide_toggle_formlabel">
-                               <source>Page enabled in menus</source>
-                       </trans-unit>
                        <trans-unit id="pages.nav_hide_checkbox_1_formlabel">
                                <source>Hide</source>
                        </trans-unit>
index 658c443..8b5f8e6 100644 (file)
@@ -42,7 +42,7 @@ return [
             ]
         ],
         'hidden' => [
-            'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.enabled',
+            'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.enabled',
             'config' => [
                 'type' => 'check',
                 'renderType' => 'checkboxToggle',