[TASK] Clean up FormEngine fields for Site Handling 89/58489/2
authorBenni Mack <benni@typo3.org>
Sun, 30 Sep 2018 11:14:34 +0000 (13:14 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 30 Sep 2018 12:16:42 +0000 (14:16 +0200)
The descriptions and listings of site language in FormEngine
hasn't been worked on since its introduction.

This is now streamlined in terms of wording and grouping,
to help people find things in a better way.

Resolves: #86470
Releases: master
Change-Id: I3692b8466c779b32d8a52d58469e5b87874643fa
Reviewed-on: https://review.typo3.org/58489
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/backend/Configuration/SiteConfiguration/site_errorhandling.php
typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php
typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf
typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf

index ae0f0f7..9060b17 100644 (file)
@@ -25,6 +25,7 @@ return [
                     'lower' => 0,
                     'upper' => 599,
                 ],
+                'size' => 8,
                 'default' => 404,
                 'valuePicker' => [
                     'mode' => '',
@@ -109,18 +110,23 @@ return [
     ],
     'types' => [
         '1' => [
-            'showitem' => 'errorCode, errorHandler',
+            'showitem' => '--palette--;;general',
         ],
         'Fluid' => [
-            'showitem' => 'errorCode, errorHandler, errorFluidTemplate,
+            'showitem' => '--palette--;;general, errorFluidTemplate,
                            --div--;LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_errorhandling.tab.rootpaths,
                            errorFluidTemplatesRootPath, errorFluidLayoutsRootPath, errorFluidPartialsRootPath',
         ],
         'Page' => [
-            'showitem' => 'errorCode, errorHandler, errorContentSource',
+            'showitem' => '--palette--;;general, errorContentSource',
         ],
         'PHP' => [
-            'showitem' => 'errorCode, errorHandler, errorPhpClassFQCN',
+            'showitem' => '--palette--;;general, errorPhpClassFQCN',
         ],
     ],
+    'palettes' => [
+        'general' => [
+            'showitem' => 'errorCode, errorHandler'
+        ]
+    ]
 ];
index ffe88d1..fcee054 100644 (file)
@@ -11,7 +11,7 @@ return [
     ],
     'columns' => [
         'languageId' => [
-            'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.language',
+            'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.languageId',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -28,16 +28,17 @@ return [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.title',
             'config' => [
                 'type' => 'input',
-                'size' => 10,
+                'size' => 15,
                 'eval' => 'required, trim',
                 'placeholder' => 'English',
             ],
         ],
         'navigationTitle' => [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.navigationTitle',
+            'description' => 'LLL:EXT:backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf:site_language.navigationTitle',
             'config' => [
                 'type' => 'input',
-                'size' => 10,
+                'size' => 15,
                 'eval' => 'trim',
                 'placeholder' => 'English',
             ],
@@ -58,11 +59,13 @@ return [
             'config' => [
                 'type' => 'input',
                 'eval' => 'required, trim',
+                'size' => 10,
                 'placeholder' => 'en_US.UTF-8',
             ],
         ],
         'iso-639-1' => [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.iso-639-1',
+            'description' => 'LLL:EXT:backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf:site_language.iso-639-1',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -72,9 +75,11 @@ return [
         ],
         'hreflang' => [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.hreflang',
+            'description' => 'LLL:EXT:backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf:site_language.hreflang',
             'config' => [
                 'type' => 'input',
                 'eval' => 'trim',
+                'size' => 6,
                 'placeholder' => 'en-US',
             ],
         ],
@@ -94,6 +99,7 @@ return [
         ],
         'direction' => [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.direction',
+            'description' => 'LLL:EXT:backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf:site_language.direction',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
@@ -421,7 +427,20 @@ return [
     ],
     'types' => [
         '1' => [
-            'showitem' => 'languageId, title, navigationTitle, base, locale, iso-639-1, hreflang, direction, typo3Language, flag, fallbackType, fallbacks, enabled',
+            'showitem' => '--palette--;;default, --palette--;;locale-related, --palette--;;rendering-related, flag',
         ],
     ],
+    'palettes' => [
+        'default' => [
+            'showitem' => 'title, enabled, languageId, --linebreak--, base'
+        ],
+        'locale-related' => [
+            'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.palette.locales',
+            'showitem' => 'typo3Language, locale, iso-639-1'
+        ],
+        'rendering-related' => [
+            'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site_language.palette.frontend',
+            'showitem' => 'navigationTitle, hreflang, direction, --linebreak--, fallbackType, --linebreak--, fallbacks'
+        ]
+    ]
 ];
index b4c4355..2084d67 100644 (file)
                                <source>Static Routes</source>
                        </trans-unit>
 
+                       <trans-unit id="site_language.palette.locales">
+                               <source>Locales</source>
+                       </trans-unit>
+                       <trans-unit id="site_language.palette.frontend">
+                               <source>Frontend related</source>
+                       </trans-unit>
                        <trans-unit id="site_language.ctrl.title">
                                <source>Language Configuration for a Site</source>
                        </trans-unit>
-                       <trans-unit id="site_language.language">
-                               <source>Language</source>
+                       <trans-unit id="site_language.languageId">
+                               <source>Language ID</source>
                        </trans-unit>
                        <trans-unit id="site_language.title">
-                               <source>Language title (e.g. "English")</source>
+                               <source>Title</source>
                        </trans-unit>
                        <trans-unit id="site_language.navigationTitle">
-                               <source>Navigation title (e.g. "English", "Deutsch", "Fran├žais")</source>
+                               <source>Navigation title</source>
                        </trans-unit>
                        <trans-unit id="site_language.base">
-                               <source>Entry point (either https://www.mydomain.fr/ or /fr/)</source>
+                               <source>Entry point</source>
                        </trans-unit>
                        <trans-unit id="site_language.locale">
-                               <source>Language locale</source>
+                               <source>Locale</source>
                        </trans-unit>
                        <trans-unit id="site_language.iso-639-1">
                                <source>Two letter ISO code</source>
                        </trans-unit>
                        <trans-unit id="site_language.hreflang">
-                               <source>Language tag defined by RFC 1766 / 3066 for "lang" and "hreflang" attributes</source>
+                               <source>Language tag defined by RFC 1766 / 3066</source>
                        </trans-unit>
                        <trans-unit id="site_language.enabled">
-                               <source>Language visible in frontend</source>
+                               <source>Visible in frontend</source>
                        </trans-unit>
                        <trans-unit id="site_language.direction">
-                               <source>Language direction for "dir" attribute</source>
+                               <source>Direction</source>
                        </trans-unit>
                        <trans-unit id="site_language.typo3Language">
                                <source>Language key for XLF files</source>
                        </trans-unit>
                        <trans-unit id="site_language.flag">
-                               <source>Select flag icon</source>
+                               <source>Flag icon</source>
                        </trans-unit>
                        <trans-unit id="site_language.fallbackType">
                                <source>Fallback type</source>
                                <source>Root Paths (optional)</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorCode">
-                               <source>Error Status Code</source>
+                               <source>HTTP Error Status Code</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorCode.404">
                                <source>404 (Page not found)</source>
index d7bbc2a..7cb1dba 100644 (file)
                                <source>This allows you to specify variants of the site's base. Can be used, for example, if you have a different domain for your staging environment.</source>
                        </trans-unit>
                        <trans-unit id="site_language.base">
-                               <source>Use / To use keep the main URL as configured at field Entry Point. Add language specific suffixes to use those, or configure complete URLs for independent domains.</source>
+                               <source>Use a full qualified domain "https://www.mydomain.fr/" or "/fr/". Use "/" to keep the main URL for the default language. Add language specific suffixes to use those, or configure complete URLs for independent domains.</source>
                        </trans-unit>
                        <trans-unit id="site_language.locale">
-                               <source>Should be something like de_DE or en_US.UTF-8</source>
+                               <source>Used for localized date and currency formats. E.g. "de_DE" or "en_US.UTF-8".</source>
+                       </trans-unit>
+                       <trans-unit id="site_language.iso-639-1">
+                               <source>ISO 639-1 code of the Language</source>
+                       </trans-unit>
+                       <trans-unit id="site_language.hreflang">
+                               <source>Used within for "lang" and "hreflang" attributes</source>
+                       </trans-unit>
+                       <trans-unit id="site_language.navigationTitle">
+                               <source>Used within language-related menus</source>
+                       </trans-unit>
+                       <trans-unit id="site_language.direction">
+                               <source>Language direction for "dir" attribute</source>
                        </trans-unit>
                        <trans-unit id="site_language.typo3Language">
                                <source>Select the language to be used from translation files. Keep default if no translation files are available.</source>