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

Housekeeping...

Browse source
This commit is contained in:
pietervdvn 2022-07-01 02:25:42 +02:00
parent c25745b133
commit 2780dc8b0b
7 changed files with 62 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Docs/Layers/school.md
View file

@ -58,7 +58,7 @@ attribute | type | values which are supported by this layer
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/school:language#values) [school:language](https://wiki.openstreetmap.org/wiki/Key:school:language) | [string](../SpecialInputElements.md#string) |
[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/school:language#values) [school:language](https://wiki.openstreetmap.org/wiki/Key:school:language) | [string](../SpecialInputElements.md#string) | [english](https://wiki.openstreetmap.org/wiki/Tag:school:language%3Denglish) [french](https://wiki.openstreetmap.org/wiki/Tag:school:language%3Dfrench) [dutch](https://wiki.openstreetmap.org/wiki/Tag:school:language%3Ddutch) [german](https://wiki.openstreetmap.org/wiki/Tag:school:language%3Dgerman)
@ -236,6 +236,10 @@ This is rendered with {school:language} is the main language of {title()}
- The main language of this school is unknown corresponds with <a href='https://wiki.openstreetmap.org/wiki/Key:school:language' target='_blank'>school:language</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:language%3Denglish' target='_blank'>english</a>
- French is the main language of {name} corresponds with <a href='https://wiki.openstreetmap.org/wiki/Key:school:language' target='_blank'>school:language</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:language%3Dfrench' target='_blank'>french</a>
- Dutch is the main language of {name} corresponds with <a href='https://wiki.openstreetmap.org/wiki/Key:school:language' target='_blank'>school:language</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:language%3Ddutch' target='_blank'>dutch</a>
- German is the main language of {name} corresponds with <a href='https://wiki.openstreetmap.org/wiki/Key:school:language' target='_blank'>school:language</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:language%3Dgerman' target='_blank'>german</a>
- The main language of this school is unknown corresponds with
- This option cannot be chosen as answer

18
assets/contributors.json
View file

@ -1,7 +1,7 @@
{
"contributors": [
{
"commits": 4014,
"commits": 4040,
"contributor": "Pieter Vander Vennet"
},
{
@ -89,7 +89,7 @@
"contributor": "LiamSimons"
},
{
"commits": 8,
"commits": 9,
"contributor": "RobJN"
},
{
@ -108,6 +108,10 @@
"commits": 7,
"contributor": "Binnette"
},
{
"commits": 6,
"contributor": "Thibault Molleman"
},
{
"commits": 6,
"contributor": "danieldegroot2"
@ -118,11 +122,11 @@
},
{
"commits": 5,
"contributor": "Thibault Molleman"
"contributor": "David Haberthür"
},
{
"commits": 5,
"contributor": "David Haberthür"
"commits": 4,
"contributor": "OliNau"
},
{
"commits": 4,
@ -144,10 +148,6 @@
"commits": 3,
"contributor": "Léo Villeveygoux"
},
{
"commits": 2,
"contributor": "OliNau"
},
{
"commits": 2,
"contributor": "pdassori"

21
assets/layers/school/school.json
View file

@ -312,17 +312,18 @@
"fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>"
},
"render": {
"en": "{school:language} is the main language of {name}",
"nl": "{school:language} is de voertaal van {name}",
"de": "{school:language} ist die Hauptsprache von {name}"
"fr": "{school:language} est la langue principale de {name}"
"en": "{school:language} is the main language of {title()}",
"nl": "{school:language} is de voertaal van {title()}",
"de": "{school:language} ist die Hauptsprache von {title()}",
"fr": "{school:language} est la langue principale de {title()}"
},
"freeform": {
"key": "school:language",
"inline": true,
"placeholder": {
"en":"Language in lowercase English",
"nl":"Taal in lowercase Engel"},
"en": "Language in lowercase English",
"nl": "Taal in lowercase Engel"
},
"addExtraTags": [
"fixme=Freeform tag `school:language` used, to be doublechecked"
]
@ -331,8 +332,10 @@
{
"if": "school:language=english",
"then": {
"en": "English is the main language of {name}",
"nl": "Engels is de voertaal van {name}"
"en": "The main language of this school is unknown",
"nl": "De voertaal van deze school is niet gekend",
"de": "Die Hauptsprache dieser Schule ist unbekannt",
"fr": "La langue principale de cette école est inconnue"
}
},
{
@ -410,4 +413,4 @@
"width": 1
}
]
}
}

3
langs/layers/de.json
View file

@ -5045,6 +5045,9 @@
"mappings": {
"0": {
"then": "Die Hauptsprache dieser Schule ist unbekannt"
},
"4": {
"then": "Die Hauptsprache dieser Schule ist unbekannt"
}
},
"question": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",

15
langs/layers/en.json
View file

@ -5042,9 +5042,24 @@
"question": "Which genders can enroll at this school?"
},
"language": {
"freeform": {
"placeholder": "Language in lowercase English"
},
"mappings": {
"0": {
"then": "The main language of this school is unknown"
},
"1": {
"then": "French is the main language of {name}"
},
"2": {
"then": "Dutch is the main language of {name}"
},
"3": {
"then": "German is the main language of {name}"
},
"4": {
"then": "The main language of this school is unknown"
}
},
"question": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",

3
langs/layers/fr.json
View file

@ -2471,6 +2471,9 @@
"mappings": {
"0": {
"then": "La langue principale de cette école est inconnue"
},
"4": {
"then": "La langue principale de cette école est inconnue"
}
},
"question": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>",

15
langs/layers/nl.json
View file

@ -4976,9 +4976,24 @@
"question": "Mogen jongens en meisjes les volgen op deze school?"
},
"language": {
"freeform": {
"placeholder": "Taal in lowercase Engel"
},
"mappings": {
"0": {
"then": "De voertaal van deze school is niet gekend"
},
"1": {
"then": "Frans is de voertaal van {name}"
},
"2": {
"then": "Nederlands is de voertaal van {name}"
},
"3": {
"then": "Duits is de voertaal van {name}"
},
"4": {
"then": "De voertaal van deze school is niet gekend"
}
},
"question": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>",