Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
This commit is contained in:
commit
223690a7cf
@ -1,27 +1,24 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect } from 'react'
|
|
||||||
import { useRecoilState, useRecoilValue } from 'recoil'
|
|
||||||
import { appMessageStore, globalLocaleStore } from '@/store/localeAtom'
|
|
||||||
import { ErrorBoundary } from 'next/dist/client/components/error-boundary'
|
import { ErrorBoundary } from 'next/dist/client/components/error-boundary'
|
||||||
import ServerError from './error'
|
import ServerError from './error'
|
||||||
|
|
||||||
import '@/styles/common.scss'
|
import '@/styles/common.scss'
|
||||||
|
|
||||||
import KO from '@/locales/ko.json'
|
// import KO from '@/locales/ko.json'
|
||||||
import JA from '@/locales/ja.json'
|
// import JA from '@/locales/ja.json'
|
||||||
|
|
||||||
export const QcastProvider = ({ children }) => {
|
export const QcastProvider = ({ children }) => {
|
||||||
const globalLocale = useRecoilValue(globalLocaleStore)
|
// const globalLocale = useRecoilValue(globalLocaleStore)
|
||||||
const [appMessageState, setAppMessageState] = useRecoilState(appMessageStore)
|
// const [appMessageState, setAppMessageState] = useRecoilState(appMessageStore)
|
||||||
|
|
||||||
useEffect(() => {
|
// useEffect(() => {
|
||||||
if (globalLocale === 'ko') {
|
// if (globalLocale === 'ko') {
|
||||||
setAppMessageState(KO)
|
// setAppMessageState(KO)
|
||||||
} else {
|
// } else {
|
||||||
setAppMessageState(JA)
|
// setAppMessageState(JA)
|
||||||
}
|
// }
|
||||||
}, [globalLocale])
|
// }, [globalLocale])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@ -1,14 +1,17 @@
|
|||||||
|
import { useEffect } from 'react'
|
||||||
import { useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { appMessageStore } from '@/store/localeAtom'
|
import { appMessageStore, globalLocaleStore } from '@/store/localeAtom'
|
||||||
|
|
||||||
// import KO from '@/locales/ko.json'
|
import KO from '@/locales/ko.json'
|
||||||
// import JA from '@/locales/ja.json'
|
import JA from '@/locales/ja.json'
|
||||||
|
|
||||||
const SESSION_STORAGE_MESSAGE_KEY = 'QCAST_MESSAGE_STORAGE'
|
const SESSION_STORAGE_MESSAGE_KEY = 'QCAST_MESSAGE_STORAGE'
|
||||||
|
|
||||||
export const useMessage = () => {
|
export const useMessage = () => {
|
||||||
// const globalLocale = useRecoilValue(globalLocaleState)
|
// const globalLocale = useRecoilValue(globalLocaleState)
|
||||||
const appMessageState = useRecoilValue(appMessageStore)
|
// const appMessageState = useRecoilValue(appMessageStore)
|
||||||
|
const globalLocale = useRecoilValue(globalLocaleStore)
|
||||||
|
const appMessageState = globalLocale === 'ko' ? KO : JA
|
||||||
|
|
||||||
const getMessage = (key, args = []) => {
|
const getMessage = (key, args = []) => {
|
||||||
// if (sessionStorage.getItem(SESSION_STORAGE_MESSAGE_KEY) === null) {
|
// if (sessionStorage.getItem(SESSION_STORAGE_MESSAGE_KEY) === null) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user