From f3db1ba5e6a4b0d33e60ec14ec78ee99a99bcc91 Mon Sep 17 00:00:00 2001
From: PatrikKozak <patrik@payloadcms.com>
Date: Tue, 9 Apr 2024 09:35:08 -0400
Subject: [PATCH] fix: changes acceptedLanguages to a set

---
 packages/translations/src/utilities/init.ts | 28 ++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/translations/src/utilities/init.ts b/packages/translations/src/utilities/init.ts
index 10900bad8a..d4adb38569 100644
--- a/packages/translations/src/utilities/init.ts
+++ b/packages/translations/src/utilities/init.ts
@@ -146,7 +146,7 @@ function parseAcceptLanguage(header: string): LanguagePreference[] {
     .sort((a, b) => b.quality - a.quality) // Sort by quality, highest to lowest
 }
 
-const acceptedLanguages = [
+const acceptedLanguages = new Set([
   'ar',
   'az',
   'bg',
@@ -177,31 +177,25 @@ const acceptedLanguages = [
   'vi',
   'zh',
   'zhTW',
-]
+])
 
 export function matchLanguage(header: string): string | undefined {
   const parsedHeader = parseAcceptLanguage(header)
-  let bestMatch = { isExactMatch: false, language: '' }
+  let matchedLanguage: string
 
   for (const { language } of parsedHeader) {
-    for (const acceptedLanguage of acceptedLanguages) {
-      if (language === acceptedLanguage) {
-        // exact match
-        if (!bestMatch.isExactMatch) {
-          bestMatch = { isExactMatch: true, language: acceptedLanguage }
+    if (acceptedLanguages.has(language)) {
+      matchedLanguage = language
+    } else {
+      acceptedLanguages.forEach((acceptedLanguage) => {
+        if (language.startsWith(acceptedLanguage)) {
+          matchedLanguage = acceptedLanguage
         }
-      } else if (
-        !bestMatch.isExactMatch &&
-        language.startsWith(acceptedLanguage) &&
-        acceptedLanguage !== bestMatch.language
-      ) {
-        // closest match
-        bestMatch = { isExactMatch: false, language: acceptedLanguage }
-      }
+      })
     }
   }
 
-  return bestMatch.language || undefined
+  return matchedLanguage
 }
 
 const initTFunction: InitTFunction = (args) => {