Open Infrastructure Map, a view of infrastructure data in OpenStreetMap
Use i18next language detector to resolve languages in style
Russ Garrettec3e82903497
diff --git a/web/package-lock.json b/web/package-lock.jsonindex b445a06..0811dc3 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -26,7 +26,6 @@"eslint-config-prettier": "^9.1.0","eslint-plugin-prettier": "^5.1.2","i18next-parser": "^9.0.2",- "in-browser-language": "^1.0.3","prettier": "^3.1.1","typescript": "^5.5.4","vite": "^5.4.8",@@ -3943,12 +3942,6 @@"node": ">=0.8.19"}},- "node_modules/in-browser-language": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/in-browser-language/-/in-browser-language-1.0.3.tgz",- "integrity": "sha512-kVKHZiWj+pDMLW/YaIP/r8OyaYVZZ4BZ/kD+fQrEp+FCoH/mprIIQhsEnUVkPuNEXCP5ZeWArOWz0KzDaLgICg==",- "dev": true- },"node_modules/inflight": {"version": "1.0.6","resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",diff --git a/web/package.json b/web/package.jsonindex db9c36c..e840ecc 100644--- a/web/package.json+++ b/web/package.json@@ -26,7 +26,6 @@"eslint-config-prettier": "^9.1.0","eslint-plugin-prettier": "^5.1.2","i18next-parser": "^9.0.2",- "in-browser-language": "^1.0.3","prettier": "^3.1.1","typescript": "^5.5.4","vite": "^5.4.8",diff --git a/web/src/index.ts b/web/src/index.tsindex d12aa7c..f6276d8 100644--- a/web/src/index.ts+++ b/web/src/index.ts@@ -5,7 +5,7 @@ import resources from 'virtual:i18next-loader'await i18next.use(LanguageDetector).init({fallbackLng: 'en',- supportedLngs: ['en', 'el'],+ supportedLngs: ['en', 'de', 'fr', 'el'],resources: resources,debug: import.meta.env.DEV})diff --git a/web/src/infopopup.ts b/web/src/infopopup.tsindex ebb2e79..4874879 100644--- a/web/src/infopopup.ts+++ b/web/src/infopopup.ts@@ -1,10 +1,8 @@import './infopopup.css'-import { t } from 'i18next'+import i18next, { t } from 'i18next'import maplibregl, { MapGeoJSONFeature, MapMouseEvent, Popup } from 'maplibre-gl'import { titleCase } from 'title-case'-// @ts-expect-error No types-import browserLanguage from 'in-browser-language'import { local_name_tags } from './l10n.ts'import friendlyNames from './friendlynames.ts'import friendlyIcons from './friendlyicons.ts'@@ -351,20 +349,16 @@ class InfoPopup {)}- const languages = browserLanguage.list()- languages.push('en')- for (const lang of languages) {- if (data['sitelinks'][`${lang}wiki`]) {- mount(- links_container,- el('a', el('div.ext_link.wikipedia_link'), {- href: data['sitelinks'][`${lang}wiki`]['url'],- target: '_blank',- title: t('wikipedia', 'Wikipedia')- })- )- break- }+ const lang = i18next.language.split('-')[0]+ if (data['sitelinks'][`${lang}wiki`]) {+ mount(+ links_container,+ el('a', el('div.ext_link.wikipedia_link'), {+ href: data['sitelinks'][`${lang}wiki`]['url'],+ target: '_blank',+ title: t('wikipedia', 'Wikipedia')+ })+ )}if (data['sitelinks']['commonswiki']) {diff --git a/web/src/l10n.ts b/web/src/l10n.tsindex d209440..4ba5cbe 100644--- a/web/src/l10n.ts+++ b/web/src/l10n.ts@@ -1,5 +1,4 @@-// @ts-expect-error No type hints-import browserLanguage from 'in-browser-language'+import i18next from 'i18next'/* List of supported languages in the OpenInfraMap layer.* This should be kept up to date with the list in tegola/layers.yml.@@ -8,10 +7,11 @@ const layer_supported_languages: string[] = ['en', 'es', 'de', 'fr', 'hi', 'ur',/* List of name tags to check, in order */function local_name_tags(): string[] {- return (browserLanguage.list() as string[])- .filter((code: string) => layer_supported_languages.includes(code))- .map((code: string) => `name_${code}`)- .concat(['name'])+ const lang = i18next.language.split('-')[0]+ if (layer_supported_languages.includes(lang)) {+ return [`name_${lang}`, 'name']+ }+ return ['name']}export { layer_supported_languages, local_name_tags }