[TASK] Exchange 'scotland' and 'wales' to ISO Codes in sys_language 04/53504/2
authorMoritz von Wirth <moritz.vonwirth@phth.de>
Fri, 14 Jul 2017 22:57:50 +0000 (00:57 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 15 Jul 2017 16:48:33 +0000 (18:48 +0200)
Resolves: #81413
Releases: master
Change-Id: I47cde4b0f5ae36e15a4de43ee55b95dc48f588fd
Reviewed-on: https://review.typo3.org/53504
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wolfgang Klinger <wolfgang@wazum.com>
Tested-by: Wolfgang Klinger <wolfgang@wazum.com>
Reviewed-by: Armin Vieweg <armin@v.ieweg.de>
Reviewed-by: Jasmina Ließmann <code@frauliessmann.de>
Tested-by: Jasmina Ließmann <code@frauliessmann.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Classes/Imaging/IconRegistry.php
typo3/sysext/core/Configuration/TCA/sys_language.php
typo3/sysext/core/Resources/Public/Icons/Flags/scotland.png [deleted file]
typo3/sysext/core/Resources/Public/Icons/Flags/wales.png [deleted file]

index 0b918e3..39821dc 100644 (file)
@@ -3017,18 +3017,6 @@ class IconRegistry implements SingletonInterface
                 'source' => 'EXT:core/Resources/Public/Icons/Flags/en_us-gb.png'
             ]
         ],
-        'flags-scotland' => [
-            'provider' => BitmapIconProvider::class,
-            'options' => [
-                'source' => 'EXT:core/Resources/Public/Icons/Flags/scotland.png'
-            ]
-        ],
-        'flags-wales' => [
-            'provider' => BitmapIconProvider::class,
-            'options' => [
-                'source' => 'EXT:core/Resources/Public/Icons/Flags/wales.png'
-            ]
-        ],
     ];
 
     /**
index 46e309b..98d33cf 100644 (file)
@@ -254,7 +254,7 @@ return [
                     ['sa', 'sa', 'flags-sa'],
                     ['sb', 'sb', 'flags-sb'],
                     ['sc', 'sc', 'flags-sc'],
-                    ['scotland', 'scotland', 'flags-scotland'],
+                    ['gb-sct', 'gb-sct', 'flags-gb-sct'],
                     ['sd', 'sd', 'flags-sd'],
                     ['se', 'se', 'flags-se'],
                     ['sg', 'sg', 'flags-sg'],
@@ -300,7 +300,7 @@ return [
                     ['vi', 'vi', 'flags-vi'],
                     ['vn', 'vn', 'flags-vn'],
                     ['vu', 'vu', 'flags-vu'],
-                    ['wales', 'wales', 'flags-wales'],
+                    ['gb-wls', 'gb-wls', 'flags-gb-wls'],
                     ['wf', 'wf', 'flags-wf'],
                     ['ws', 'ws', 'flags-ws'],
                     ['ye', 'ye', 'flags-ye'],
diff --git a/typo3/sysext/core/Resources/Public/Icons/Flags/scotland.png b/typo3/sysext/core/Resources/Public/Icons/Flags/scotland.png
deleted file mode 100644 (file)
index 638e859..0000000
Binary files a/typo3/sysext/core/Resources/Public/Icons/Flags/scotland.png and /dev/null differ
diff --git a/typo3/sysext/core/Resources/Public/Icons/Flags/wales.png b/typo3/sysext/core/Resources/Public/Icons/Flags/wales.png
deleted file mode 100644 (file)
index 7af2e64..0000000
Binary files a/typo3/sysext/core/Resources/Public/Icons/Flags/wales.png and /dev/null differ