From a2013908db1846de7b10f22b1dacdcafc0032e47 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 21 Jan 2016 07:43:02 +0100
Subject: [PATCH] [FOLLOWUP][TASK] Remove charset functionality for locales

Textual changes

Resolves: #72826
Releases: master
Change-Id: I57bf559adff612a783176463365e1e8c36da6714
Reviewed-on: https://review.typo3.org/46128
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
 ...ovedCustomCharsetConfigurationForLocales.rst | 17 ++++++++++++-----
 .../sysext/t3editor/Resources/Private/tsref.xml |  2 --
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72826-RemovedCustomCharsetConfigurationForLocales.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72826-RemovedCustomCharsetConfigurationForLocales.rst
index 95a1a46416c1..cb9176d6b1f8 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72826-RemovedCustomCharsetConfigurationForLocales.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72826-RemovedCustomCharsetConfigurationForLocales.rst
@@ -5,7 +5,9 @@ Breaking: #72826 - Removed custom charset configuration for locales
 Description
 ===========
 
-The TYPO3 Frontend resolves the TypoScript option ``config.locale_all`` and stores the charset part within ``$TSFE->localeCharset``. If the option ``locale_all`` does not provide a charset (e.g. when it is set to ``de_AT`` instead of ``de_AT.UTF-8`` a "best guess" was done based on a static list set up in 2004.
+The TYPO3 Frontend resolved the TypoScript option ``config.locale_all`` and stored the charset part within
+``$TSFE->localeCharset``. If the option ``locale_all`` did not provide a charset (e.g. when it is set to ``de_AT``
+instead of ``de_AT.UTF-8`` a "best guess" was done based on a static list set up in 2004.
 
 The option ``$TSFE->localeCharset`` was removed, along with the following calculation options and methods
 available in the CharsetConverter class:
@@ -18,13 +20,16 @@ available in the CharsetConverter class:
 
 The localeCharset option was solely used within the TypoScript functionality ``stdWrap.strftime`` when no
 custom character set was given, and a character set conversion from the "localeCharset" (based on the best guess
-or explicitly set via ``config.locale_all = de_AT.UTF-8`` and it was different than the renderCharset option of the TYPO3 Frontend.
+or explicitly set via ``config.locale_all = de_AT.UTF-8`` and it was different than the renderCharset option of
+the TYPO3 Frontend.
 
 
 Impact
 ======
 
-When custom locales are configured in TypoScript which are not present on the server, or the character set of ``config.locale_all`` differs from the ``config.renderCharset``, or ``config.locale_all`` does not set a character set, could lead to unexpected output in the TYPO3 Frontend.
+When custom locales are configured in TypoScript which are not present on the server, or the character set of
+``config.locale_all`` differs from the ``config.renderCharset``, or ``config.locale_all`` does not set a character set,
+could lead to unexpected output in the TYPO3 Frontend.
 
 
 Affected Installations
@@ -37,7 +42,9 @@ servers that don't have the charset of the locale available but the output shoul
 Migration
 =========
 
-As this is a misconfiguration and only necessary if e.g. can not handle UTF-8 locales, config.set_locale can explicitly set to ``de_AT@iso-8859-15`` and the output should be renderCharset. On instances where ``stdWrap.strftime``is used, the subproperty ``charset`` can be set to the custom character set (e.g. ``iso-8859-15``).
+As this is a misconfiguration and only necessary if e.g. can not handle UTF-8 locales, config.set_locale can explicitly
+set to ``de_AT@iso-8859-15`` and the output should be renderCharset. On instances where ``stdWrap.strftime``is used,
+the subproperty ``charset`` can be set to the custom character set (e.g. ``iso-8859-15``).
 
 In each case, it should be configured that the ``config.locale_all`` option should have a character set given, to avoid
-any side-effects with the TypoScript stdWrap option ``strftime``.
\ No newline at end of file
+any side-effects with the TypoScript stdWrap option ``strftime``.
diff --git a/typo3/sysext/t3editor/Resources/Private/tsref.xml b/typo3/sysext/t3editor/Resources/Private/tsref.xml
index 7989e92eddf6..983e2800938c 100644
--- a/typo3/sysext/t3editor/Resources/Private/tsref.xml
+++ b/typo3/sysext/t3editor/Resources/Private/tsref.xml
@@ -558,8 +558,6 @@ Same as above, but "&L=[L-value]" will only be added if the current value is 1,
 			<description><![CDATA[PHP: setlocale("LC_ALL", [value]);
 value-examples: deutsch, de_DE, danish, portuguese, spanish, french, norwegian, italian. See www.php.net for other value. Also on linux, look at /usr/share/locale/
 
-TSFE->localeCharset is intelligently set to the assumed charset of the locale strings. This is used in stdWrap.strftime to convert locale strings to the renderCharset of the frontend.
-
 Example:
 This will render dates in danish made with stdWrap/strftime:
 locale_all = danish
-- 
GitLab