midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: fix #1506, language-URL-parameter works again and is properly documented

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-07-16 02:46:53 +02:00
parent 3b33d69c82
commit 2942a2dae7
3 changed files with 52 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Logic/State/UserRelatedState.ts
View file

@ -1,15 +1,15 @@
import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig"
import { OsmConnection } from "../Osm/OsmConnection"
import { MangroveIdentity } from "../Web/MangroveReviews"
import { Store, Stores, UIEventSource } from "../UIEventSource"
import {OsmConnection} from "../Osm/OsmConnection"
import {MangroveIdentity} from "../Web/MangroveReviews"
import {Store, Stores, UIEventSource} from "../UIEventSource"
import StaticFeatureSource from "../FeatureSource/Sources/StaticFeatureSource"
import { FeatureSource } from "../FeatureSource/FeatureSource"
import { Feature } from "geojson"
import { Utils } from "../../Utils"
import {FeatureSource} from "../FeatureSource/FeatureSource"
import {Feature} from "geojson"
import {Utils} from "../../Utils"
import translators from "../../assets/translators.json"
import codeContributors from "../../assets/contributors.json"
import LayerConfig from "../../Models/ThemeConfig/LayerConfig"
import { LayerConfigJson } from "../../Models/ThemeConfig/Json/LayerConfigJson"
import {LayerConfigJson} from "../../Models/ThemeConfig/Json/LayerConfigJson"
import usersettings from "../../assets/generated/layers/usersettings.json"
import Locale from "../../UI/i18n/Locale"
import LinkToWeblate from "../../UI/Base/LinkToWeblate"
@ -92,7 +92,7 @@ export default class UserRelatedState {
this.osmConnection.GetLongPreference("identity", "mangrove")
)
this.InitializeLanguage(availableLanguages)
this.language.addCallbackAndRunD((language) => Locale.language.setData(language))
this.installedUserThemes = this.InitInstalledUserThemes()
@ -178,28 +178,6 @@ export default class UserRelatedState {
)
}
}
private InitializeLanguage(availableLanguages?: string[]) {
this.language.addCallbackAndRunD((language) => Locale.language.setData(language))
Locale.language.addCallback((currentLanguage) => {
if (Locale.showLinkToWeblate.data) {
return true // Disable auto switching as we are in translators mode
}
if (availableLanguages?.indexOf(currentLanguage) < 0) {
console.log(
"Resetting language to",
availableLanguages[0],
"as",
currentLanguage,
" is unsupported"
)
// The current language is not supported -> switch to a supported one
Locale.language.setData(availableLanguages[0])
}
})
Locale.language.ping()
}
private InitInstalledUserThemes(): Store<string[]> {
const prefix = "mapcomplete-unofficial-theme-"
const postfix = "-combined-length"

7
Logic/Web/QueryParameters.ts
View file

@ -54,6 +54,7 @@ export class QueryParameters {
}
public static wasInitialized(key: string): boolean {
this.init()
return QueryParameters._wasInitialized.has(key)
}
@ -76,11 +77,10 @@ export class QueryParameters {
if (window?.location?.search) {
const params = window.location.search.substr(1).split("&")
for (const param of params) {
const kv = param.split("=")
const key = decodeURIComponent(kv[0])
const [key, value] = param.split("=")
QueryParameters.addOrder(key)
QueryParameters._wasInitialized.add(key)
const v = decodeURIComponent(kv[1])
const v = decodeURIComponent(value)
const source = new UIEventSource<string>(v)
source.addCallback(() => QueryParameters.Serialize())
QueryParameters.knownSources[key] = source
@ -131,4 +131,5 @@ export class QueryParameters {
QueryParameters._wasInitialized.clear()
QueryParameters.order = []
}
}