Skip to content

fix: lang variant detection #95

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.

Sign up for GitHub

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

Merged
pfeerick merged 2 commits into from
Feb 15, 2025
Merged

fix: lang variant detection #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f7786
Update i18next-browser-languagedetector to 8.0.2
rickard-von-essen Feb 14, 2025
0843671
i18n lang detection: remove language variant from detected langs
rickard-von-essen Feb 14, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"graphql-subscriptions": "^2.0.0",
"graphql-tag": "^2.12.6",
"i18next": "^21.10.0",
"i18next-browser-languagedetector": "^6.1.8",
"i18next-browser-languagedetector": "^8.0.2",
"is-mobile": "^3.1.1",
"iso-639-1": "^3.1.2",
"js-file-download": "^0.4.12",
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/i18n/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ void i18n
// so we have to not keep any of the basic html nodes
transKeepBasicHtmlNodesFor: [],
},
detection: {
convertDetectedLanguage: (lng: string) => lng.split("-")[0],
},
});

export default i18n;
23 changes: 16 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.19.0":
"@babel/runtime@npm:^7.17.2":
version: 7.24.4
resolution: "@babel/runtime@npm:7.24.4"
dependencies:
Expand All @@ -1940,6 +1940,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.23.2":
version: 7.26.7
resolution: "@babel/runtime@npm:7.26.7"
dependencies:
regenerator-runtime: ^0.14.0
checksum: 60199c049f90e5e41c687687430052a370aca60bac7859ff4ee761c5c1739b8ba1604d391d01588c22dc0e93828cbadb8ada742578ad1b1df240746bce98729a
languageName: node
linkType: hard

"@babel/template@npm:^7.12.7, @babel/template@npm:^7.15.4, @babel/template@npm:^7.16.0":
version: 7.16.0
resolution: "@babel/template@npm:7.16.0"
Expand Down Expand Up @@ -12219,7 +12228,7 @@ __metadata:
html-webpack-plugin: ^5.6.0
husky: ^7.0.4
i18next: ^21.10.0
i18next-browser-languagedetector: ^6.1.8
i18next-browser-languagedetector: ^8.0.2
i18next-parser: ^5.4.0
is-ci: ^3.0.1
is-mobile: ^3.1.1
Expand Down Expand Up @@ -15782,12 +15791,12 @@ __metadata:
languageName: node
linkType: hard

"i18next-browser-languagedetector@npm:^6.1.8":
version: 6.1.8
resolution: "i18next-browser-languagedetector@npm:6.1.8"
"i18next-browser-languagedetector@npm:^8.0.2":
version: 8.0.2
resolution: "i18next-browser-languagedetector@npm:8.0.2"
dependencies:
"@babel/runtime": ^7.19.0
checksum: ab679a136de2b9df5984e810ea6ae8f848ac85d64562930f7d9be38d5cff139ed14262fd4abfde8a9a66b01cb521306e87493df766625194b90f0eb240be6f6a
"@babel/runtime": ^7.23.2
checksum: b4ed7531ab503da12e043209c396b1aa9a0bdb2bbb397c0c85605bf16f08bf4cdacf9c1866cd32be1f19266488accb8d15dc8a76a6046e9ee359284199a8dcbc
languageName: node
linkType: hard

Expand Down