maeshinshin 1 год назад
Родитель
Сommit
8839d9e250
1 измененных файлов с 5 добавлено и 9 удалено
  1. 5 9
      apps/app/src/pages/utils/commons.ts

+ 5 - 9
apps/app/src/pages/utils/commons.ts

@@ -116,15 +116,6 @@ export const langMap: LangMap = {
   [Lang.fr_FR]: Locale['fr-FR'],
 };
 
-// use this function to get locale for html lang attribute
-export const getLocaleAtServerSide = (req: CrowiRequest): Locale => {
-  const { user, headers } = req;
-  const { configManager } = req.crowi;
-
-  return langMap[user == null ? detectLocaleFromBrowserAcceptLanguage(headers)
-    : (user.lang ?? configManager.getConfig('crowi', 'app:globalLang') as Lang ?? Lang.en_US) ?? Lang.en_US];
-};
-
 // use this function to translate content
 export const getLangAtServerSide = (req: CrowiRequest): Lang => {
   const { user, headers } = req;
@@ -134,6 +125,11 @@ export const getLangAtServerSide = (req: CrowiRequest): Lang => {
     : (user.lang ?? configManager.getConfig('crowi', 'app:globalLang') as Lang ?? Lang.en_US) ?? Lang.en_US;
 };
 
+// use this function to get locale for html lang attribute
+export const getLocaleAtServerSide = (req: CrowiRequest): Locale => {
+  return langMap[getLangAtServerSide(req)];
+};
+
 export const getNextI18NextConfig = async(
     // 'serverSideTranslations' method should be given from Next.js Page
     //  because importing it in this file causes https://github.com/isaachinman/next-i18next/issues/1545