Support @ notation for localization files #15665
Merged
Conversation
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 pull request has conflicts ☹ |
ramonlsouza
requested review from
JoVictorNunes
and removed request for
antobinary
|
Kudos, SonarCloud Quality Gate passed!
|
| @@ -136,6 +137,8 @@ class IntlStartup extends Component { | |||
| } | |||
|
|
|||
| const dasherizedLocale = normalizedLocale.replace('_', '-'); | |||
| const { language, formattedLocale } = formatLocaleCode(dasherizedLocale); | |||
|
|
|||
| this.setState({ messages: mergedMessages, fetching: false, normalizedLocale: dasherizedLocale }, () => { | |||
There was a problem hiding this comment.
Suggested change
| this.setState({ messages: mergedMessages, fetching: false, normalizedLocale: dasherizedLocale }, () => { | |
| this.setState({ messages: mergedMessages, fetching: false, normalizedLocale: formattedLocale }, () => { |
I think you can set it right away and access it later in render().
| @@ -157,14 +162,15 @@ class IntlStartup extends Component { | |||
| render() { | |||
| const { fetching, normalizedLocale, messages } = this.state; | |||
| const { children } = this.props; | |||
| const { formattedLocale } = formatLocaleCode(normalizedLocale); | |||
There was a problem hiding this comment.
Suggested change
| const { formattedLocale } = formatLocaleCode(normalizedLocale); |
See the comment above.
|
|
||
| return ( | ||
| <> | ||
| {(fetching || !normalizedLocale) && <LoadingScreen />} | ||
|
|
||
| {normalizedLocale | ||
| && ( | ||
| <IntlProvider fallbackOnEmptyString={FALLBACK_ON_EMPTY_STRING} locale={normalizedLocale} messages={messages}> | ||
| <IntlProvider fallbackOnEmptyString={FALLBACK_ON_EMPTY_STRING} locale={formattedLocale} messages={messages}> |
There was a problem hiding this comment.
Suggested change
| <IntlProvider fallbackOnEmptyString={FALLBACK_ON_EMPTY_STRING} locale={formattedLocale} messages={messages}> | |
| <IntlProvider fallbackOnEmptyString={FALLBACK_ON_EMPTY_STRING} locale={normalizedLocale} messages={messages}> |
See the comment above.
JoVictorNunes
approved these changes
Sep 29, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
xx@xxxxuz@Cyrlto the fallbackLocales (locales that are not in LangMap)IntlStartupinstead ofAppcomponent (so it is correctly set in first load and after a refresh)Closes Issue(s)
Closes #15660