From 8154da04ba1c401bbe58df69fb6e0bda1395c440 Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Fri, 17 Apr 2020 21:28:45 +0200
Subject: [PATCH] [BUGFIX] Use correct identifier for "england" flag icon
Resolves: #91099
Releases: master, 9.5
Change-Id: I08ea8ecfc7096a21b0ffddee0b4e3976363fffd5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64219
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Richard Haeser <richard@maxserv.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Richard Haeser <richard@maxserv.com>
---
.../SiteConfiguration/site_language.php | 2 +-
...-91099-ChangedFlagIdentifierForEngland.rst | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Important-91099-ChangedFlagIdentifierForEngland.rst
diff --git a/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php
index fae1a1951c4f..1241ece60950 100644
--- a/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php
+++ b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php
@@ -207,7 +207,7 @@ return [
['eg', 'eg', 'flags-eg'],
['eh', 'eh', 'flags-eh'],
['en-us-gb', 'en-us-gb', 'flags-en-us-gb'],
- ['england', 'england', 'flags-gb-eng'],
+ ['gb-eng', 'gb-eng', 'flags-gb-eng'],
['er', 'er', 'flags-er'],
['es', 'es', 'flags-es'],
['et', 'et', 'flags-et'],
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-91099-ChangedFlagIdentifierForEngland.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-91099-ChangedFlagIdentifierForEngland.rst
new file mode 100644
index 000000000000..43c4332a68e8
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Important-91099-ChangedFlagIdentifierForEngland.rst
@@ -0,0 +1,19 @@
+.. include:: ../../Includes.txt
+
+====================================================================
+Important: #91099 - Flag identifier changed for SiteLanguage England
+====================================================================
+
+See :issue:`91099`
+
+Description
+===========
+
+The flag identifier for England ("england") in the SiteLanguage was broken and resulted
+in a broken icon in the backend.
+To fix that issue the identifier has been changed ("gb-eng") and results in a proper icon.
+
+If you used this flag identifier in your Frontend setup, double check whether things are
+still working as desired.
+
+.. index:: Backend, ext:backend
--
GitLab