-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix overwrite context keys from example i18n setup #467
Closed
Closed
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 55 additions & 58 deletions
113
login-workflow/src/contexts/AuthContext/i18nAuthInstance.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,68 @@ | ||
| import i18next from 'i18next'; | ||
| import { AuthDictionaries } from './AuthDictionaries'; | ||
| import { SharedDictionaries } from '../SharedDictionaries'; | ||
| import { initReactI18next } from 'react-i18next'; | ||
|
|
||
| void i18next | ||
| .use(initReactI18next) // passes i18n down to react-i18next | ||
| .init( | ||
| { | ||
| fallbackLng: 'en', | ||
| ns: ['bluiAuth', 'bluiCommon'], | ||
| defaultNS: 'bluiAuth', | ||
| load: 'languageOnly', | ||
| detection: { | ||
| order: ['querystring', 'localStorage', 'navigator'], | ||
| caches: ['localStorage'], | ||
| export const i18nAuthInstance = i18next.createInstance( | ||
| { | ||
| fallbackLng: 'en', | ||
| ns: ['bluiAuth', 'bluiCommon'], | ||
| defaultNS: 'bluiAuth', | ||
| load: 'languageOnly', | ||
| detection: { | ||
| order: ['querystring', 'localStorage', 'navigator'], | ||
| caches: ['localStorage'], | ||
| }, | ||
| react: { useSuspense: false }, | ||
| interpolation: { escapeValue: false }, | ||
| resources: { | ||
| en: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.english.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.english.translation, | ||
| }, | ||
| }, | ||
| react: { useSuspense: false }, | ||
| interpolation: { escapeValue: false }, | ||
| resources: { | ||
| en: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.english.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.english.translation, | ||
| }, | ||
| fr: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.french.translation, | ||
| }, | ||
| fr: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.french.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.french.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.french.translation, | ||
| }, | ||
| }, | ||
| es: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.spanish.translation, | ||
| }, | ||
| es: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.spanish.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.spanish.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.spanish.translation, | ||
| }, | ||
| zh: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.chinese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.chinese.translation, | ||
| }, | ||
| }, | ||
| zh: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.chinese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.chinese.translation, | ||
| }, | ||
| }, | ||
| pt: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.portuguese.translation, | ||
| }, | ||
| pt: { | ||
| bluiAuth: { | ||
| ...AuthDictionaries.portuguese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.portuguese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.portuguese.translation, | ||
| }, | ||
| }, | ||
| }, | ||
| // We must provide a function as second parameter, otherwise i18next errors | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| (err, _t) => { | ||
| // eslint-disable-next-line no-console | ||
| if (err) return console.log(err); | ||
| } | ||
| ); | ||
| }, | ||
| // We must provide a function as second parameter, otherwise i18next errors | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| (err, _t) => { | ||
| // eslint-disable-next-line no-console | ||
| if (err) return console.log(err); | ||
| } | ||
| ); | ||
|
|
||
| export default i18next; | ||
| export default { i18nAuthInstance }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 55 additions & 58 deletions
113
login-workflow/src/contexts/RegistrationContext/i18nRegistrationInstance.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,68 @@ | ||
| import i18next from 'i18next'; | ||
| import { RegistrationDictionaries } from './RegistrationDictionaries'; | ||
| import { SharedDictionaries } from '../SharedDictionaries'; | ||
| import { initReactI18next } from 'react-i18next'; | ||
|
|
||
| void i18next | ||
| .use(initReactI18next) // passes i18n down to react-i18next | ||
| .init( | ||
| { | ||
| fallbackLng: 'en', | ||
| ns: ['bluiRegistration', 'bluiCommon'], | ||
| defaultNS: 'bluiRegistration', | ||
| load: 'languageOnly', | ||
| detection: { | ||
| order: ['querystring', 'localStorage', 'navigator'], | ||
| caches: ['localStorage'], | ||
| export const i18nRegistrationInstance = i18next.createInstance( | ||
| { | ||
| fallbackLng: 'en', | ||
| ns: ['bluiRegistration', 'bluiCommon'], | ||
| defaultNS: 'bluiRegistration', | ||
| load: 'languageOnly', | ||
| detection: { | ||
| order: ['querystring', 'localStorage', 'navigator'], | ||
| caches: ['localStorage'], | ||
| }, | ||
| react: { useSuspense: false }, | ||
| interpolation: { escapeValue: false }, | ||
| resources: { | ||
| en: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.english.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.english.translation, | ||
| }, | ||
| }, | ||
| react: { useSuspense: false }, | ||
| interpolation: { escapeValue: false }, | ||
| resources: { | ||
| en: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.english.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.english.translation, | ||
| }, | ||
| fr: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.french.translation, | ||
| }, | ||
| fr: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.french.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.french.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.french.translation, | ||
| }, | ||
| }, | ||
| es: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.spanish.translation, | ||
| }, | ||
| es: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.spanish.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.spanish.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.spanish.translation, | ||
| }, | ||
| zh: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.chinese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.chinese.translation, | ||
| }, | ||
| }, | ||
| zh: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.chinese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.chinese.translation, | ||
| }, | ||
| }, | ||
| pt: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.portuguese.translation, | ||
| }, | ||
| pt: { | ||
| bluiRegistration: { | ||
| ...RegistrationDictionaries.portuguese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.portuguese.translation, | ||
| }, | ||
| bluiCommon: { | ||
| ...SharedDictionaries.portuguese.translation, | ||
| }, | ||
| }, | ||
| }, | ||
| // We must provide a function as second parameter, otherwise i18next errors | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| (err, _t) => { | ||
| // eslint-disable-next-line no-console | ||
| if (err) return console.log(err); | ||
| } | ||
| ); | ||
| }, | ||
| // We must provide a function as second parameter, otherwise i18next errors | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| (err, _t) => { | ||
| // eslint-disable-next-line no-console | ||
| if (err) return console.log(err); | ||
| } | ||
| ); | ||
|
|
||
| export default i18next; | ||
| export default { i18nRegistrationInstance }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a little bizarre...not sure if it's causing your issue, but you're doing what looks like a double destructuring of the i18n prop. You set
i18nInstanceto the passed prop or the default auth instance...and then you destructure thei18nprop again on line 22. I don't think causes any errors, it's just very strange.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
App translations were breaking because app routes were part of auth routes( earlier change password was part of auth context this might be the reason for moving app routes inside auth). Fixed it now.