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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-03-08 02:07:22 +01:00
commit db25d64409
30 changed files with 556 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -622,7 +622,8 @@ class MiscTagRenderingChecks extends DesugaringStep<TagRenderingConfigJson> {
warnings.push(
"At " +
context +
": the question contains a div, a span, a br or an element with class 'subtle'. Please, use a `questionHint` instead"
": the question contains a div, a span, a br or an element with class 'subtle'. Please, use a `questionHint` instead.\n The question is: " +
question.textFor("en")
)
}
}

2
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -120,7 +120,7 @@ export default class TagRenderingConfig {
this.labels = json.labels ?? []
this.render = Translations.T(json.render, translationKey + ".render")
this.question = Translations.T(json.question, translationKey + ".question")
this.question = Translations.T(json.questionHint, translationKey + ".questionHint")
this.questionhint = Translations.T(json.questionHint, translationKey + ".questionHint")
this.description = Translations.T(json.description, translationKey + ".description")
this.condition = TagUtils.Tag(json.condition ?? { and: [] }, `${context}.condition`)
if (json.freeform) {