Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/use-i18n/src/__tests__/usei18n.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ describe('i18n hook', () => {
jest.spyOn(window, 'navigator', 'get').mockImplementation(() => ({
language: 'en-US',
languages: ['en-US', 'en'],
}))
}) as unknown as Navigator)
const { result, waitForNextUpdate } = renderHook(() => useI18n(), {
wrapper: wrapper({
defaultLocale: 'fr',
Expand All @@ -201,7 +201,7 @@ describe('i18n hook', () => {
jest.spyOn(window, 'navigator', 'get').mockImplementation(() => ({
language: 'en',
languages: undefined,
}))
}) as unknown as Navigator)
const { result, waitForNextUpdate } = renderHook(() => useI18n(), {
wrapper: wrapper({
defaultLocale: 'fr',
Expand Down Expand Up @@ -278,7 +278,7 @@ describe('i18n hook', () => {
}),
})
await waitForNextUpdate()
const identiqueTranslate = result.current.namespaceTranslation()
const identiqueTranslate = result.current.namespaceTranslation('')
expect(identiqueTranslate('title')).toEqual(result.current.t('title'))

const translate = result.current.namespaceTranslation('tests.test')
Expand Down
4 changes: 2 additions & 2 deletions packages/use-i18n/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import usei18n from './usei18n'
import I18nContextProvider from './usei18n'

export * from './usei18n'

export default usei18n
export default I18nContextProvider
26 changes: 11 additions & 15 deletions packages/use-i18n/src/usei18n.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,18 @@ const I18nContextProvider = ({
children,
defaultLoad,
loadDateLocale,
defaultDateLocale,
defaultLocale,
defaultTranslations,
enableDefaultLocale,
enableDebugKey,
localeItemStorage,
defaultTranslations = {},
enableDefaultLocale = false,
enableDebugKey = false,
localeItemStorage = LOCALE_ITEM_STORAGE,
supportedLocales,
}: {
children: ReactNode,
defaultLoad: LoadTranslationsFn,
loadDateLocale: LoadLocaleFn,
loadDateLocale?: LoadLocaleFn,
defaultDateLocale?: Locale,
defaultLocale: string,
defaultTranslations: TranslationsByLocales,
enableDefaultLocale: boolean,
Expand All @@ -142,10 +144,10 @@ const I18nContextProvider = ({
)
const [translations, setTranslations] = useState<TranslationsByLocales>(defaultTranslations)
const [namespaces, setNamespaces] = useState<string[]>([])
const [dateFnsLocale, setDateFnsLocale] = useState<Locale>()
const [dateFnsLocale, setDateFnsLocale] = useState<Locale | undefined>(defaultDateLocale ?? undefined)

useEffect(() => {
loadDateLocale(currentLocale === 'en' ? 'en-GB' : currentLocale)
loadDateLocale?.(currentLocale === 'en' ? 'en-GB' : currentLocale)
.then(setDateFnsLocale)
.catch(() => loadDateLocale('en-GB').then(setDateFnsLocale))
}, [loadDateLocale, currentLocale])
Expand Down Expand Up @@ -340,21 +342,15 @@ const I18nContextProvider = ({
return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>
}

I18nContextProvider.defaultProps = {
defaultTranslations: {},
enableDebugKey: false,
enableDefaultLocale: false,
localeItemStorage: LOCALE_ITEM_STORAGE,
}

I18nContextProvider.propTypes = {
children: PropTypes.node.isRequired,
defaultDateLocale: PropTypes.shape({}),
defaultLoad: PropTypes.func.isRequired,
defaultLocale: PropTypes.string.isRequired,
defaultTranslations: PropTypes.shape({}),
enableDebugKey: PropTypes.bool,
enableDefaultLocale: PropTypes.bool,
loadDateLocale: PropTypes.func.isRequired,
loadDateLocale: PropTypes.func,
localeItemStorage: PropTypes.string,
supportedLocales: PropTypes.arrayOf(PropTypes.string).isRequired,
}
Expand Down