refactor locale-utils

apps/app/src/components/PageEditor/DrawioModal.tsx

@@ -4,6 +4,7 @@ import React, {
   useMemo,
 } from 'react';
 
+import type { Lang } from '@growi/core';
 import { useCodeMirrorEditorIsolated, useDrawioModalForEditor } from '@growi/editor/dist/client';
 import { LoadingSpinner } from '@growi/ui/dist/components';
 import {
@@ -11,7 +12,6 @@ import {
   ModalBody,
 } from 'reactstrap';
 
-import { getDiagramsNetLangCode } from '~/client/util/locale-utils';
 import { replaceFocusedDrawioWithEditor, getMarkdownDrawioMxfile } from '~/components/PageEditor/markdown-drawio-util-for-editor';
 import { useRendererConfig } from '~/stores/context';
 import { useDrawioModal } from '~/stores/modal';
@@ -23,6 +23,19 @@ import { type DrawioConfig, DrawioCommunicationHelper } from './DrawioCommunicat
 
 const logger = loggerFactory('growi:components:DrawioModal');
 
+
+// https://docs.google.com/spreadsheets/d/1FoYdyEraEQuWofzbYCDPKN7EdKgS_2ZrsDrOA8scgwQ
+const DIAGRAMS_NET_LANG_MAP = {
+  ja_JP: 'ja',
+  zh_CN: 'zh',
+  fr_FR: 'fr',
+};
+
+export const getDiagramsNetLangCode = (lang: Lang) => {
+  return DIAGRAMS_NET_LANG_MAP[lang];
+};
+
+
 const headerColor = '#334455';
 const fontFamily = "-apple-system, BlinkMacSystemFont, 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif";
 

apps/app/src/pages/utils/commons.ts

@@ -8,13 +8,13 @@ import type { SSRConfig, UserConfig } from 'next-i18next';
 
 import * as nextI18NextConfig from '^/config/next-i18next.config';
 
-import { detectLocaleFromBrowserAcceptLanguage } from '~/client/util/locale-utils';
 import { type SupportedActionType } from '~/interfaces/activity';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 import type { ISidebarConfig } from '~/interfaces/sidebar-config';
 import type { IUserUISettings } from '~/interfaces/user-ui-settings';
 import type { PageDocument } from '~/server/models/page';
 import type { UserUISettingsDocument } from '~/server/models/user-ui-settings';
+import { detectLocaleFromBrowserAcceptLanguage } from '~/server/util/locale-utils';
 import {
   useCurrentProductNavWidth, useCurrentSidebarContents, usePreferCollapsedMode,
 } from '~/stores/ui';

apps/app/src/client/util/locale-utils.ts → apps/app/src/server/util/locale-utils.ts

@@ -4,13 +4,6 @@ import { Lang } from '@growi/core';
 
 import { defaultLang } from '^/config/i18next.config';
 
-// https://docs.google.com/spreadsheets/d/1FoYdyEraEQuWofzbYCDPKN7EdKgS_2ZrsDrOA8scgwQ
-const DIAGRAMS_NET_LANG_MAP = {
-  ja_JP: 'ja',
-  zh_CN: 'zh',
-  fr_FR: 'fr',
-};
-
 const ACCEPT_LANG_MAP = {
   en: Lang.en_US,
   ja: Lang.ja_JP,
@@ -18,10 +11,6 @@ const ACCEPT_LANG_MAP = {
   fr: Lang.fr_FR,
 };
 
-export const getDiagramsNetLangCode = (lang) => {
-  return DIAGRAMS_NET_LANG_MAP[lang];
-};
-
 /**
  * It return the first language that matches ACCEPT_LANG_MAP keys from sorted accept languages array
  * @param sortedAcceptLanguagesArray