-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Use FES internationalization within the minor version #7878
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
Open
ksen0
wants to merge
2
commits into
main
Choose a base branch
from
fes-version
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 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 hidden or 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,5 +1,7 @@ | ||
import i18next from 'i18next'; | ||
import LanguageDetector from 'i18next-browser-languagedetector'; | ||
import * as constants from './constants'; | ||
|
||
|
||
let fallbackResources, languages; | ||
if (typeof IS_MINIFIED === 'undefined') { | ||
|
@@ -127,6 +129,7 @@ export let translator = (key, values) => { | |
* Set up our translation function, with loaded languages | ||
*/ | ||
export const initialize = () => { | ||
let latestMinorVersionPath = 'https://cdn.jsdelivr.net/npm/p5@' + constants.VERSION.replace(/^(\d+\.\d+)\.\d+.*$/, '$1'); | ||
let i18init = i18next | ||
.use(LanguageDetector) | ||
.use(FetchResources) | ||
|
@@ -149,8 +152,7 @@ export const initialize = () => { | |
}, | ||
backend: { | ||
fallback: 'en', | ||
loadPath: | ||
'https://cdn.jsdelivr.net/npm/p5/translations/{{lng}}/{{ns}}.json' | ||
loadPath: latestMinorVersionPath + '/translations/{{lng}}/{{ns}}.json' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and then here, we could compose it like loadPath: `${getCDNPath}/translations/{{lng}}/{{ns}}.json` There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and then I think with string interpolation we could simply write with one liner change: loadPath: `https://cdn.jsdelivr.net/npm/p5@${constants.VERSION.replace(/^(\d+\.\d+)\.\d+.*$/, '$1')}/translations/{{lng}}/{{ns}}.json` |
||
}, | ||
partialBundledLanguages: true, | ||
resources: fallbackResources | ||
|
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.
Hi @ksen0 , @limzykenneth just a thought here.
Will it be a better idea to separate out the base
CDN
URL here and the version parsing logic for better readability and reusability too, and then compose the finalloadPath
. I was thinking to encapsulate it like below: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.
I'm not sure it's worth to split it out in this way, especially also encapsulating it in a function, if needed, just a string interpolation should suffice as well.
`https://cdn.jsdelivr.net/npm/p5@${constants.VERSION.replace(/^(\d+\.\d+)\.\d+.*$/, '$1')}`
Uh oh!
There was an error while loading. Please reload this page.
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.
Yes, I see that there's no broader scope for reusability in this case, so I agree — using direct string interpolation is sufficient and keeps it clean.
Uh oh!
There was an error while loading. Please reload this page.
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.
My initial thought was that separating the base URL and version logic might help with readability and clarity, especially if more dynamic paths were ever added later. But given the current usage, simplicity could be more prioritized.
Thanks for sharing this!