Client/ppanel-web
5
0
Fork 0
mirror of https://github.com/perfect-panel/ppanel-web.git synced 2026-02-13 20:01:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(locale): Default value

Browse Source
This commit is contained in:
web@ppanel 2024-11-16 14:46:09 +07:00
parent a0bb101126
commit 937408fc57
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/admin/config/constants.ts
View File

@ -2,7 +2,7 @@ import { env } from 'next-runtime-env';
export const locales = ['en-US', 'zh-CN']; 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_SITE_URL = env('NEXT_PUBLIC_SITE_URL');
export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL');

6
apps/admin/locales/request.ts
View File

@ -1,15 +1,13 @@
import { locales, NEXT_PUBLIC_DEFAULT_LANGUAGE } from '@/config/constants';
import { getRequestConfig } from 'next-intl/server'; import { getRequestConfig } from 'next-intl/server';
import { cookies, headers } from 'next/headers'; import { cookies, headers } from 'next/headers';
const locales = ['zh-CN', 'en-US'];
export default getRequestConfig(async () => { export default getRequestConfig(async () => {
const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || ''; const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || '';
const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : '';
const cookieLocale = (await cookies()).get('locale')?.value || ''; const cookieLocale = (await cookies()).get('locale')?.value || '';
const locale = const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE;
cookieLocale || defaultLocale || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0];
const messages = { const messages = {
language: (await import(`./${locale}/language.json`)).default, language: (await import(`./${locale}/language.json`)).default,

2
apps/admin/utils/common.ts
View File

@ -12,7 +12,7 @@ export function getLocale() {
const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : '';
const cookies = new Cookies(null, { path: '/' }); const cookies = new Cookies(null, { path: '/' });
const cookieLocale = cookies.get('locale') || ''; 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; return locale;
} }

2
apps/user/config/constants.ts
View File

@ -2,7 +2,7 @@ import { env } from 'next-runtime-env';
export const locales = ['en-US', 'zh-CN']; 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_SITE_URL = env('NEXT_PUBLIC_SITE_URL');
export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL');

6
apps/user/locales/request.ts
View File

@ -1,15 +1,13 @@
import { locales, NEXT_PUBLIC_DEFAULT_LANGUAGE } from '@/config/constants';
import { getRequestConfig } from 'next-intl/server'; import { getRequestConfig } from 'next-intl/server';
import { cookies, headers } from 'next/headers'; import { cookies, headers } from 'next/headers';
const locales = ['zh-CN', 'en-US'];
export default getRequestConfig(async () => { export default getRequestConfig(async () => {
const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || ''; const browserLocale = (await headers()).get('Accept-Language')?.split(',')?.[0] || '';
const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : '';
const cookieLocale = (await cookies()).get('locale')?.value || ''; const cookieLocale = (await cookies()).get('locale')?.value || '';
const locale = const locale = cookieLocale || defaultLocale || NEXT_PUBLIC_DEFAULT_LANGUAGE;
cookieLocale || defaultLocale || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0];
const messages = { const messages = {
language: (await import(`./${locale}/language.json`)).default, language: (await import(`./${locale}/language.json`)).default,

2
apps/user/utils/common.ts
View File

@ -12,7 +12,7 @@ export function getLocale() {
const defaultLocale = locales.includes(browserLocale) ? browserLocale : ''; const defaultLocale = locales.includes(browserLocale) ? browserLocale : '';
const cookies = new Cookies(null, { path: '/' }); const cookies = new Cookies(null, { path: '/' });
const cookieLocale = cookies.get('locale') || ''; 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; return locale;
} }