From 331f13f7cb65dc2d617976da25c12f90c2f0c851 Mon Sep 17 00:00:00 2001 From: Dorian Maliszewski Date: Thu, 6 Apr 2023 14:44:52 +0200 Subject: [PATCH 1/2] fix: enableDebugKey display key --- packages/use-i18n/src/__tests__/usei18n.tsx | 16 +++++----------- packages/use-i18n/src/usei18n.tsx | 8 ++++---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/packages/use-i18n/src/__tests__/usei18n.tsx b/packages/use-i18n/src/__tests__/usei18n.tsx index 1a2af31af..7a8f052b2 100644 --- a/packages/use-i18n/src/__tests__/usei18n.tsx +++ b/packages/use-i18n/src/__tests__/usei18n.tsx @@ -297,17 +297,11 @@ describe('i18n hook', () => { expect(result.current.t('test')).toEqual('test') await waitFor(() => { - expect(result.current.t('title')).toEqual(en.title) - expect(result.current.t('subtitle')).toEqual(en.subtitle) - expect(result.current.t('plurals', { numPhotos: 0 })).toEqual( - 'You have no photos.', - ) - expect(result.current.t('plurals', { numPhotos: 1 })).toEqual( - 'You have one photo.', - ) - expect(result.current.t('plurals', { numPhotos: 2 })).toEqual( - 'You have 2 photos.', - ) + expect(result.current.t('title')).toEqual('title') + expect(result.current.t('subtitle')).toEqual('subtitle') + expect(result.current.t('plurals', { numPhotos: 0 })).toEqual('plurals') + expect(result.current.t('plurals', { numPhotos: 1 })).toEqual('plurals') + expect(result.current.t('plurals', { numPhotos: 2 })).toEqual('plurals') }) }) diff --git a/packages/use-i18n/src/usei18n.tsx b/packages/use-i18n/src/usei18n.tsx index 06d7e4797..a3b5abe10 100644 --- a/packages/use-i18n/src/usei18n.tsx +++ b/packages/use-i18n/src/usei18n.tsx @@ -330,11 +330,11 @@ const I18nContextProvider = ({ const translate = useCallback( (key: string, context?: ReactParamsObject) => { const value = translations[currentLocale]?.[key] as string - if (!value) { - if (enableDebugKey) { - return key - } + if (enableDebugKey) { + return key + } + if (!value) { return '' } if (context) { From aafc6a81ec0471ef7fd0a1d4f9baa70f64b9b145 Mon Sep 17 00:00:00 2001 From: Dorian Maliszewski Date: Thu, 6 Apr 2023 14:46:56 +0200 Subject: [PATCH 2/2] fix: changeset --- .changeset/khaki-turtles-move.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/khaki-turtles-move.md diff --git a/.changeset/khaki-turtles-move.md b/.changeset/khaki-turtles-move.md new file mode 100644 index 000000000..577d1663e --- /dev/null +++ b/.changeset/khaki-turtles-move.md @@ -0,0 +1,5 @@ +--- +'@scaleway/use-i18n': minor +--- + +enableDebugKey should always return the key