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

Fix overzealous language check for unofficial themes

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-10-04 13:50:24 +02:00
parent b50788074b
commit 218cf3b151
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Models/ThemeConfig/Conversion/Validation.ts
View file

@ -15,8 +15,6 @@ import Translations from "../../../UI/i18n/Translations"
import Svg from "../../../Svg" import Svg from "../../../Svg"
import {QuestionableTagRenderingConfigJson} from "../Json/QuestionableTagRenderingConfigJson" import {QuestionableTagRenderingConfigJson} from "../Json/QuestionableTagRenderingConfigJson"
import FilterConfigJson from "../Json/FilterConfigJson"; import FilterConfigJson from "../Json/FilterConfigJson";
import {control} from "leaflet";
import layers = control.layers;
import DeleteConfig from "../DeleteConfig"; import DeleteConfig from "../DeleteConfig";
class ValidateLanguageCompleteness extends DesugaringStep<any> { class ValidateLanguageCompleteness extends DesugaringStep<any> {
@ -269,7 +267,7 @@ class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
).convert(theme, theme.id) ).convert(theme, theme.id)
errors.push(...checked.errors) errors.push(...checked.errors)
} }
if (!json.hideFromOverview && theme.id !== "personal") { if (!json.hideFromOverview && theme.id !== "personal" && this._isBuiltin) {
// The first key in the the title-field must be english, otherwise the title in the loading page will be the different language // The first key in the the title-field must be english, otherwise the title in the loading page will be the different language
const targetLanguage = theme.title.SupportedLanguages()[0] const targetLanguage = theme.title.SupportedLanguages()[0]
if (targetLanguage !== "en") { if (targetLanguage !== "en") {

2
Models/ThemeConfig/LayoutConfig.ts
View file

@ -79,7 +79,7 @@ export default class LayoutConfig {
} }
const context = this.id const context = this.id
this.credits = json.credits this.credits = json.credits
this.language = json.mustHaveLanguage ?? Array.from(Object.keys(json.title)) this.language = json.mustHaveLanguage ?? ( official ? ["en"] : [])
this.usedImages = Array.from( this.usedImages = Array.from(
new ExtractImages(official, undefined).convertStrict( new ExtractImages(official, undefined).convertStrict(
json, json,