From 937408fc574cde8d9ceddf9d48bcf702e76d64af Mon Sep 17 00:00:00 2001 From: "web@ppanel" Date: Sat, 16 Nov 2024 14:46:09 +0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(locale):=20Default=20value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/config/constants.ts | 2 +- apps/admin/locales/request.ts | 6 ++---- apps/admin/utils/common.ts | 2 +- apps/user/config/constants.ts | 2 +- apps/user/locales/request.ts | 6 ++---- apps/user/utils/common.ts | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/apps/admin/config/constants.ts b/apps/admin/config/constants.ts index d92dba1..fa3f488 100644 --- a/apps/admin/config/constants.ts +++ b/apps/admin/config/constants.ts @@ -2,7 +2,7 @@ import { env } from 'next-runtime-env'; export const locales = ['en-US', 'zh-CN']; -export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE'); +export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || locales[0]; export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL'); export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); diff --git a/apps/admin/locales/request.ts b/apps/admin/locales/request.ts index ce0de70..5a4fddb 100644 --- a/apps/admin/locales/request.ts +++ b/apps/admin/locales/request.ts @@ -1,15 +1,13 @@ +import { locales, NEXT_PUBLIC_DEFAULT_LANGUAGE } from '@/config/constants'; import { getRequestConfig } from 'next-intl/server'; import { cookies, headers } from 'next/headers'; -const locales = ['zh-CN', 'en-US']; - export default getRequestConfig(async () => { const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const cookieLocale = (await cookies()).get('locale')?.value || ''; - const locale = - cookieLocale || defaultLocale || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; + const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE; const messages = { language: (await import(`./${locale}/language.json`)).default, diff --git a/apps/admin/utils/common.ts b/apps/admin/utils/common.ts index 3c90421..28bfbb8 100644 --- a/apps/admin/utils/common.ts +++ b/apps/admin/utils/common.ts @@ -12,7 +12,7 @@ export function getLocale() { const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const cookies = new Cookies(null, { path: '/' }); const cookieLocale = cookies.get('locale') || ''; - const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; + const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE; return locale; } diff --git a/apps/user/config/constants.ts b/apps/user/config/constants.ts index 72d9289..9b1d224 100644 --- a/apps/user/config/constants.ts +++ b/apps/user/config/constants.ts @@ -2,7 +2,7 @@ import { env } from 'next-runtime-env'; export const locales = ['en-US', 'zh-CN']; -export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE'); +export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || locales[0]; export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL'); export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); diff --git a/apps/user/locales/request.ts b/apps/user/locales/request.ts index 57065dc..0e02edd 100644 --- a/apps/user/locales/request.ts +++ b/apps/user/locales/request.ts @@ -1,15 +1,13 @@ +import { locales, NEXT_PUBLIC_DEFAULT_LANGUAGE } from '@/config/constants'; import { getRequestConfig } from 'next-intl/server'; import { cookies, headers } from 'next/headers'; -const locales = ['zh-CN', 'en-US']; - export default getRequestConfig(async () => { const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const cookieLocale = (await cookies()).get('locale')?.value || ''; - const locale = - cookieLocale || defaultLocale || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; + const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE; const messages = { language: (await import(`./${locale}/language.json`)).default, diff --git a/apps/user/utils/common.ts b/apps/user/utils/common.ts index 2b63997..488a056 100644 --- a/apps/user/utils/common.ts +++ b/apps/user/utils/common.ts @@ -12,7 +12,7 @@ export function getLocale() { const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const cookies = new Cookies(null, { path: '/' }); const cookieLocale = cookies.get('locale') || ''; - const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; + const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE; return locale; }