From 7fd4b221809a93908edfcbd7f40afdf3caa0c07a Mon Sep 17 00:00:00 2001 From: James Date: Thu, 3 Feb 2022 11:47:21 -0500 Subject: [PATCH] chore: ensures locale is initiated properly if present in query param --- src/admin/components/utilities/Locale/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/admin/components/utilities/Locale/index.tsx b/src/admin/components/utilities/Locale/index.tsx index 4fa2348ba3..b52921fad0 100644 --- a/src/admin/components/utilities/Locale/index.tsx +++ b/src/admin/components/utilities/Locale/index.tsx @@ -11,9 +11,9 @@ export const LocaleProvider: React.FC = ({ children }) => { const { localization } = useConfig(); const { user } = useAuth(); const defaultLocale = (localization && localization.defaultLocale) ? localization.defaultLocale : 'en'; - const [locale, setLocale] = useState(defaultLocale); - const { getPreference, setPreference } = usePreferences(); const searchParams = useSearchParams(); + const [locale, setLocale] = useState(searchParams?.locale as string || defaultLocale); + const { getPreference, setPreference } = usePreferences(); const localeFromParams = searchParams.locale; useEffect(() => {