[TASK] Streamline labels of site configuration 08/58508/2
authorSusanne Moog <susanne.moog@typo3.org>
Sun, 30 Sep 2018 19:18:54 +0000 (21:18 +0200)
committerBenni Mack <benni@typo3.org>
Sun, 30 Sep 2018 19:50:55 +0000 (21:50 +0200)
Labels have been rewritten to consequently use
title case. Additionally, the layout of the
main site tab has been adjusted.

Resolves: #86485
Releases: master
Change-Id: I5186c3a4506d546dc61ef8e4e9e41491b123ace4
Reviewed-on: https://review.typo3.org/58508
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Josef Glatz <josef.glatz@typo3.org>
Tested-by: Josef Glatz <josef.glatz@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/backend/Configuration/SiteConfiguration/site.php
typo3/sysext/backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf
typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf

index 67aecc3..599fc6f 100644 (file)
@@ -23,6 +23,7 @@ return [
         ],
         'rootPageId' => [
             'label' => 'LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site.rootPageId',
+            'description' => 'LLL:EXT:backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf:site.rootPageId',
             'config' => [
                 'type' => 'select',
                 'readOnly' => true,
@@ -98,10 +99,18 @@ return [
     ],
     'types' => [
         '0' => [
-            'showitem' => 'identifier, rootPageId, base,baseVariants,
+            'showitem' => '--palette--;;default,--palette--;;base,
                 --div--;LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site.tab.languages, languages,
                 --div--;LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site.tab.errorHandling, errorHandling,
                 --div--;LLL:EXT:backend/Resources/Private/Language/locallang_siteconfiguration_tca.xlf:site.tab.routes, routes',
         ],
     ],
+    'palettes' => [
+        'default' => [
+            'showitem' => 'rootPageId, identifier'
+        ],
+        'base' => [
+            'showitem' => 'base, baseVariants'
+        ]
+    ]
 ];
index 2084d67..1c3daa8 100644 (file)
                                <source>Site Identifier</source>
                        </trans-unit>
                        <trans-unit id="site.rootPageId">
-                               <source>Root Page ID (You must create a page with a site root flag)</source>
+                               <source>Root Page ID</source>
                        </trans-unit>
                        <trans-unit id="site.base">
-                               <source>Entry point (can be https://www.mydomain/ or just /, if it is just / you can not rely on TYPO3 creating full URLs)</source>
+                               <source>Entry Point</source>
                        </trans-unit>
                        <trans-unit id="site.baseVariants">
-                               <source>Variants for the entry point</source>
+                               <source>Variants for the Entry Point</source>
                        </trans-unit>
                        <trans-unit id="site.languages">
-                               <source>Available Languages for this site</source>
+                               <source>Available Languages for this Site</source>
                        </trans-unit>
                        <trans-unit id="site.errorHandling">
                                <source>Error Handling</source>
                                <source>Title</source>
                        </trans-unit>
                        <trans-unit id="site_language.navigationTitle">
-                               <source>Navigation title</source>
+                               <source>Navigation Title</source>
                        </trans-unit>
                        <trans-unit id="site_language.base">
-                               <source>Entry point</source>
+                               <source>Entry Point</source>
                        </trans-unit>
                        <trans-unit id="site_language.locale">
                                <source>Locale</source>
                        </trans-unit>
                        <trans-unit id="site_language.iso-639-1">
-                               <source>Two letter ISO code</source>
+                               <source>Two Letter ISO Code</source>
                        </trans-unit>
                        <trans-unit id="site_language.hreflang">
-                               <source>Language tag defined by RFC 1766 / 3066</source>
+                               <source>Language Tag defined by RFC 1766 / 3066</source>
                        </trans-unit>
                        <trans-unit id="site_language.enabled">
-                               <source>Visible in frontend</source>
+                               <source>Visible in Frontend</source>
                        </trans-unit>
                        <trans-unit id="site_language.direction">
                                <source>Direction</source>
                        </trans-unit>
                        <trans-unit id="site_language.typo3Language">
-                               <source>Language key for XLF files</source>
+                               <source>Language Key for XLF Files</source>
                        </trans-unit>
                        <trans-unit id="site_language.flag">
                                <source>Flag icon</source>
                        </trans-unit>
                        <trans-unit id="site_language.fallbackType">
-                               <source>Fallback type</source>
+                               <source>Fallback Type</source>
                        </trans-unit>
                        <trans-unit id="site_language.fallbacks">
-                               <source>Fallback to other language(s) - order is important!</source>
+                               <source>Fallback to other Language(s) - order is important!</source>
                        </trans-unit>
                        <trans-unit id="site_base_variant.ctrl.title">
                                <source>Base</source>
                                <source>Application Context</source>
                        </trans-unit>
                        <trans-unit id="site_base_variant.condition.environmentVariable">
-                               <source>Environment variable</source>
+                               <source>Environment Variable</source>
                        </trans-unit>
 
                        <trans-unit id="site_errorhandling.ctrl.title">
                                <source>any error not defined otherwise</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorHandler">
-                               <source>How to handle errors</source>
+                               <source>How to handle Errors</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorHandler.fluid">
                                <source>Fluid Template</source>
                                <source>Fluid Partials Root Path</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorContentSource">
-                               <source>Show Content From Page</source>
+                               <source>Show Content from Page</source>
                        </trans-unit>
                        <trans-unit id="site_errorhandling.errorPhpClassFQCN">
                                <source>ErrorHandler Class Target (FQCN)</source>
index 7cb1dba..bf00835 100644 (file)
@@ -3,11 +3,15 @@
        <file t3:id="1522923345" source-language="en" datatype="plaintext" original="messages" date="2015-01-02T11:16:11Z" product-name="backend">
                <header/>
                <body>
+                       <trans-unit id="site.rootPageId">
+                               <source>You must create a page with a site root flag.</source>
+                       </trans-unit>
                        <trans-unit id="site.identifier">
                                <source>This name will be used to create the configuration directory. Mind the recommendations for directory names (only a-z,0-9,_,-) and make it unique.</source>
                        </trans-unit>
                        <trans-unit id="site.base">
-                               <source>Main URL to call the frontend in default language.</source>
+                               <source>Main URL to call the frontend in default language. Can be https://www.example.com/ or just /, if it is just a / you cannot rely on TYPO3 creating
+                                       full URLs</source>
                        </trans-unit>
                        <trans-unit id="site.baseVariants">
                                <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>