From d51c5f40d39f9229d70dc1b04796d66b9c4e7c47 Mon Sep 17 00:00:00 2001
From: Benjamin Kott <benjamin.kott@wfp2.com>
Date: Mon, 9 Apr 2018 19:54:36 +0200
Subject: [PATCH] [BUGFIX] Use existing locale in site handling examples
Resolves: #84675
Releases: master
Change-Id: If8873b88bd5976729ac75b1ef876bdc9ccd2b6ae
Reviewed-on: https://review.typo3.org/56615
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Private/Language/siteconfiguration_fieldinformation.xlf | 2 +-
.../Changelog/master/Feature-84581-SiteHandling.rst | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf b/typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf
index 5051ff417db1..3436c675376f 100644
--- a/typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/siteconfiguration_fieldinformation.xlf
@@ -13,7 +13,7 @@
<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>
</trans-unit>
<trans-unit id="sys_site_language.locale">
- <source>should be something like de_DE or en_EN.UTF8</source>
+ <source>should be something like de_DE or en_US.UTF8</source>
</trans-unit>
<trans-unit id="sys_site_language.typo3Language">
<source>Select the language to be used from translation files. Keep default if no translation files are available.</source>
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-84581-SiteHandling.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-84581-SiteHandling.rst
index 45c7222329cc..1d6a05e2812e 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Feature-84581-SiteHandling.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-84581-SiteHandling.rst
@@ -48,7 +48,7 @@ config.yaml
# Language base. Accepts either a fully qualified URL or a path segment like "/en/".
base: /
# sets the locale during frontend rendering
- locale: en_EN.UTF8
+ locale: en_US.UTF8
# ???
iso-639-1: en
# FE href language
@@ -154,4 +154,4 @@ template:
Links to pages within a site can now be generated via **any** access of TYPO3, so in both BE and FE as well as CLI mode.
-.. index:: Backend, Frontend, TypoScript
\ No newline at end of file
+.. index:: Backend, Frontend, TypoScript
--
GitLab