From 4df7faef6db11cb7e6a82a98835b38701ce6b1d5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Sep 2023 19:22:52 +0000
Subject: [PATCH] Simplified conversion

---
 src/Core/L10n.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 9d1fa7016..96935a4ed 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -414,16 +414,15 @@ class L10n
 	 */
 	public function convertForLanguageDetection(array $languages): array
 	{
-		$languages['fi'] = $languages['fi-fi'];
-		unset($languages['fi-fi']);
-		$languages['da'] = $languages['da-dk'];
-		unset($languages['da-dk']);
-		$languages['nb'] = $languages['nb-no'];
-		unset($languages['nb-no']);
-		$languages['pt-BR'] = $languages['pt-br'];
-		unset($languages['pt-br']);
-		$languages['zh-Hans'] = $languages['zh-cn'];
-		unset($languages['zh-cn']);
+		foreach ($languages as $key => $language) {
+			$newkey = $this->convertCodeForLanguageDetection($key);
+			if ($newkey != $key) {
+				if (!isset($languages[$newkey])) {
+					$languages[$newkey] = $language;
+				}
+				unset($languages[$key]);
+			}
+		}
 
 		ksort($languages);