summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-02-05 13:49:18 +0000
committerHazelnoot <acomputerdog@gmail.com>2025-02-05 13:49:18 +0000
commit8a087e75a5fc96ca101481bda9f0f86a7653aaa7 (patch)
treee54858099674b2c28aa5eb9a28f4b2cf877d970a /packages/backend/src/server/web
parentmerge: Use package manager version from package.json (!883) (diff)
parentgeneralize current language so we match more broadly on fallback (diff)
downloadsharkey-8a087e75a5fc96ca101481bda9f0f86a7653aaa7.tar.gz
sharkey-8a087e75a5fc96ca101481bda9f0f86a7653aaa7.tar.bz2
sharkey-8a087e75a5fc96ca101481bda9f0f86a7653aaa7.zip
merge: Improve language detection. (!871)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/871 Approved-by: Hazelnoot <acomputerdog@gmail.com> Approved-by: dakkar <dakkar@thenautilus.net>
Diffstat (limited to 'packages/backend/src/server/web')
-rw-r--r--packages/backend/src/server/web/boot.embed.js2
-rw-r--r--packages/backend/src/server/web/boot.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js
index b07dce3ac4..1af1dc545b 100644
--- a/packages/backend/src/server/web/boot.embed.js
+++ b/packages/backend/src/server/web/boot.embed.js
@@ -48,7 +48,7 @@
if (supportedLangs.includes(navigator.language)) {
lang = navigator.language;
} else {
- lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+ lang = supportedLangs.find(x => x.split('-')[0] === navigator.language.split('-')[0]);
// Fallback
if (lang == null) lang = 'en-US';
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index bf83340bde..54750e26e5 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -39,7 +39,7 @@
if (supportedLangs.includes(navigator.language)) {
lang = navigator.language;
} else {
- lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+ lang = supportedLangs.find(x => x.split('-')[0] === navigator.language.split('-')[0]);
// Fallback
if (lang == null) lang = 'en-US';