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

Fix: fix #2346

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-04-15 16:39:18 +02:00
parent 3d4eb321b2
commit 0fdf9448a9
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Logic/Web/Wikidata.ts
View file

@ -1,6 +1,6 @@
import { Utils } from "../../Utils" import { Utils } from "../../Utils"
import { Store, UIEventSource } from "../UIEventSource" import { Store, UIEventSource } from "../UIEventSource"
import { WBK } from "wikibase-sdk" import { SimplifiedClaims, WBK } from "wikibase-sdk"
export class WikidataResponse { export class WikidataResponse {
public readonly id: string public readonly id: string
@ -54,14 +54,13 @@ export class WikidataResponse {
} }
static extractClaims(claimsJson: any): Map<string, Set<string>> { static extractClaims(claimsJson: any): Map<string, Set<string>> {
// @ts-ignore const simplified: SimplifiedClaims = Wikidata.wds.simplify.claims(claimsJson, {
const simplified = Wikidata.wds.simplify.claims(claimsJson, {
timeConverter: "simple-day", timeConverter: "simple-day",
}) })
const claims = new Map<string, Set<string>>() const claims = new Map<string, Set<string>>()
for (const claimId in simplified) { for (const claimId in simplified) {
const claimsList: any[] = simplified[claimId] const claimsList = simplified[claimId]
claims.set(claimId, new Set(claimsList)) claims.set(claimId, new Set(claimsList))
} }
return claims return claims
@ -439,6 +438,9 @@ export default class Wikidata {
return new WikidataLexeme(response).asWikidataResponse() return new WikidataLexeme(response).asWikidataResponse()
} }
return WikidataResponse.fromJson(response) const resp: WikidataResponse = WikidataResponse.fromJson(response)
// 'mul' is the fallback language for wikidata, see https://source.mapcomplete.org/MapComplete/MapComplete/issues/2346
resp.labels.set("*", resp.labels.get("mul"))
return resp
} }
} }

13
src/UI/i18n/Translation.ts
View file

@ -165,16 +165,17 @@ export class Translation extends BaseUIElement {
* Which language will be effectively used for the given language of choice? * Which language will be effectively used for the given language of choice?
*/ */
public actualLanguage(language: string): "*" | string | undefined { public actualLanguage(language: string): "*" | string | undefined {
if (this.translations["*"]) {
return "*"
}
const txt = this.translations[language] const txt = this.translations[language]
if (txt === undefined && this._strictLanguages) {
return undefined
}
if (txt !== undefined) { if (txt !== undefined) {
return language return language
} }
if (this._strictLanguages) {
return undefined
}
if (this.translations["*"]) {
return "*"
}
if (this.translations["en"] !== undefined) { if (this.translations["en"] !== undefined) {
return "en" return "en"
} }