#434

frontend/src/components/TopNav.tsx

@@ -12,9 +12,7 @@ import TopNavUser from '@/components/TopNavUser'
 import TranslatedText from '@/components/TranslatedText'
 import { toast } from '@/components/ui/use-toast'
 import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
-import { languageUIMessage } from '@/lib/i18n'
 import { isLocaleCode,
-	 localeLanguage,
 	 localeFromPath,
 	 switchLocalePath,
 	 unlocalisedPath } from '@/lib/locales'
@@ -134,7 +132,7 @@ export const menuOutline = (
 const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
   const { message, label } = useUITranslation ('shared')
   const locale = useLocale ()
-  const localeName = languageUIMessage (localeLanguage (locale), locale).text
+  const localeName = locales.find (entry => entry.code === locale)?.name
   const navigate = useLocaleNavigate ()
   const location = useLocation ()
   const currentLocation = useRef (location)
@@ -449,7 +447,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
 	    }}>
 	  {locales.map (entry => isLocaleCode (entry.code) && (
 	      <option key={entry.code} value={entry.code}>
-		{formatUIString (languageUIMessage (localeLanguage (entry.code), locale).text, locale)}
+		{formatUIString (entry.name, entry.code)}
 	      </option>))}
 	</select>
       </label>)