From d4432dd1838f28ee2f3637114ff97ff63e22b0de Mon Sep 17 00:00:00 2001
From: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
Date: Wed, 13 Sep 2023 09:45:26 +0200
Subject: [PATCH] feat(admin-ui): Add display name + pull supported languages
 from config (#5028)

---
 .changeset/early-months-nail.md                    |  6 ++++++
 .../language-settings/language-menu.tsx            |  7 ++++---
 packages/admin-ui/ui/src/i18n/index.ts             | 14 +++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/early-months-nail.md

diff --git a/.changeset/early-months-nail.md b/.changeset/early-months-nail.md
new file mode 100644
index 0000000000..5de2c0db58
--- /dev/null
+++ b/.changeset/early-months-nail.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/admin-ui": patch
+"@medusajs/admin": patch
+---
+
+feat(admin-ui): Add display name + pull supported languages from config
diff --git a/packages/admin-ui/ui/src/domain/settings/personal-information/language-settings/language-menu.tsx b/packages/admin-ui/ui/src/domain/settings/personal-information/language-settings/language-menu.tsx
index c0cfe7bdf3..dafe107b83 100644
--- a/packages/admin-ui/ui/src/domain/settings/personal-information/language-settings/language-menu.tsx
+++ b/packages/admin-ui/ui/src/domain/settings/personal-information/language-settings/language-menu.tsx
@@ -1,6 +1,7 @@
 import React from "react"
 import { useTranslation } from "react-i18next"
 import { Select } from "@medusajs/ui"
+import { supportedLanguages } from "../../../../i18n"
 
 const LanguageMenu: React.FC = () => {
   const { i18n } = useTranslation()
@@ -16,9 +17,9 @@ const LanguageMenu: React.FC = () => {
           <Select.Value />
         </Select.Trigger>
         <Select.Content>
-          {i18n.languages.map((lng) => (
-            <Select.Item key={lng} value={lng}>
-              {lng}
+          {supportedLanguages.map((lng) => (
+            <Select.Item key={lng.locale} value={lng.locale}>
+              {lng.name}
             </Select.Item>
           ))}
         </Select.Content>
diff --git a/packages/admin-ui/ui/src/i18n/index.ts b/packages/admin-ui/ui/src/i18n/index.ts
index 457fe846a6..afe769ba49 100644
--- a/packages/admin-ui/ui/src/i18n/index.ts
+++ b/packages/admin-ui/ui/src/i18n/index.ts
@@ -1,7 +1,14 @@
 import i18n from "i18next"
-import { initReactI18next } from "react-i18next"
-import Backend from "i18next-http-backend"
 import LanguageDetector from "i18next-browser-languagedetector"
+import Backend from "i18next-http-backend"
+import { initReactI18next } from "react-i18next"
+
+export const supportedLanguages = [
+  {
+    locale: "en",
+    name: "English",
+  },
+]
 
 void i18n
   .use(Backend)
@@ -9,7 +16,8 @@ void i18n
   .use(initReactI18next)
   // https://www.i18next.com/overview/configuration-options
   .init({
-    fallbackLng: ["en"],
+    supportedLngs: supportedLanguages.map((l) => l.locale),
+    fallbackLng: "en",
     returnNull: false,
     debug: true,
     interpolation: {