Skip to content

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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: 4 additions & 2 deletions src/core/internationalization.js
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 { version } from '../../package.json';


let fallbackResources, languages;
if (typeof IS_MINIFIED === 'undefined') {
Expand Down Expand Up @@ -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@' + version.replace(/^(\d+\.\d+)\.\d+.*$/, '$1');
let i18init = i18next
.use(LanguageDetector)
.use(FetchResources)
Expand All @@ -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'
Copy link
Contributor

Choose a reason for hiding this comment

The 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`

Copy link
Contributor

Choose a reason for hiding this comment

The 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
Expand Down