From 3462c5e702696205b1aba726e5bec80cc554aef2 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Tue, 7 Sep 2021 23:40:09 +0200 Subject: [PATCH] Fix food.json theme where the translations got fucked up; fixes #470 --- assets/layers/food/food.json | 140 +++++++++++++---------------------- langs/layers/en.json | 14 +++- langs/layers/fr.json | 22 +----- langs/layers/ja.json | 11 --- langs/layers/nl.json | 38 +++++----- langs/layers/ru.json | 7 -- 6 files changed, 84 insertions(+), 148 deletions(-) diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json index 4fa94f5d1..e91626704 100644 --- a/assets/layers/food/food.json +++ b/assets/layers/food/food.json @@ -391,39 +391,70 @@ { "#": "halal (no friture)", "question": { - "nl": "Heeft deze frituur vegetarische snacks?", - "fr": "Cette friterie est-elle équipée de snacks végétariens ?" + "en": "Does this restaurant offer a halal menu?", + "nl": "Heeft dit restaurant halal opties?" }, "mappings": [ { "if": "diet:halal=no", "then": { - "nl": "Er zijn vegetarische snacks aanwezig", - "fr": "Des collations végétariennes sont disponibles" + "en": "There are no halal options available", + "nl": "Er zijn geen halal opties aanwezig" } }, { "if": "diet:halal=limited", + "then": { + "en": "There is a small halal menu", + "nl": "Er zijn een beperkt aantal halal opties" + } + }, + { + "if": "diet:halal=yes", + "then": { + "nl": "Halal menu verkrijgbaar", + "en": "There is a halal menu" + } + }, + { + "if": "diet:halal=only", + "then": { + "nl": "Enkel halal opties zijn beschikbaar", + "en": "Only halal options are available" + } + } + ], + "condition": "cuisine!=friture" + }, + { + "question": { + "nl": "Heeft deze frituur vegetarische snacks?", + "fr": "Cette friterie est-elle équipée de snacks végétariens ?" + }, + "mappings": [ + { + "if": "diet:vegetarian=yes", + "then": { + "nl": "Er zijn vegetarische snacks aanwezig", + "fr": "Des collations végétariens sont disponibles" + } + }, + { + "if": "diet:vegetarian=limited", "then": { "nl": "Slechts enkele vegetarische snacks", "fr": "Quelques snacks végétariens seulement" } }, { - "if": "diet:halal=yes", + "if": "diet:vegetarian=no", "then": { "nl": "Geen vegetarische snacks beschikbaar", "fr": "Pas d'en-cas végétariens disponibles" } - }, - { - "if": "diet:halal=only", - "then": { - "nl": "Enkel halal opties zijn beschikbaar" - } } ], - "condition": "cuisine!=friture" + "condition": "cuisine=friture" }, { "question": { @@ -432,33 +463,21 @@ }, "mappings": [ { - "if": { - "and": [ - "diet:vegetarian=yes" - ] - }, + "if": "diet:vegan=yes", "then": { "nl": "Er zijn veganistische snacks aanwezig", "fr": "Des collations végétaliens sont disponibles" } }, { - "if": { - "and": [ - "diet:vegetarian=limited" - ] - }, + "if": "diet:vegan=limited", "then": { "nl": "Slechts enkele veganistische snacks", "fr": "Quelques snacks végétaliens seulement" } }, { - "if": { - "and": [ - "diet:vegetarian=no" - ] - }, + "if": "diet:vegan=no", "then": { "nl": "Geen veganistische snacks beschikbaar", "fr": "Pas d'en-cas végétaliens disponibles" @@ -474,37 +493,18 @@ }, "mappings": [ { - "if": { - "and": [ - "diet:vegan=yes" - ] - }, + "if": "friture:oil=vegetable", "then": { "nl": "Plantaardige olie", "fr": "Huile végétale" } }, { - "if": { - "and": [ - "diet:vegan=limited" - ] - }, + "if": "friture:oil=animal", "then": { "nl": "Dierlijk vet", "fr": "Graisse animale" } - }, - { - "if": { - "and": [ - "diet:vegetarian=no" - ] - }, - "then": { - "nl": "Geen veganistische snacks beschikbaar", - "fr": "Pas d'en-cas végétaliens disponibles" - } } ], "condition": "cuisine=friture" @@ -518,11 +518,7 @@ }, "mappings": [ { - "if": { - "and": [ - "friture:oil=vegetable" - ] - }, + "if": "reusable_packaging:accept=yes", "then": { "nl": "Je mag je eigen containers meenemen om je bestelling in mee te nemen en zo minder afval te maken", "fr": "Vous pouvez apporter vos contenants pour votre commande, limitant l’usage de matériaux à usage unique et les déchets", @@ -531,11 +527,7 @@ } }, { - "if": { - "and": [ - "friture:oil=animal" - ] - }, + "if": "reusable_packaging:accept=no", "then": { "nl": "Je mag geen eigen containers meenemen om je bestelling in mee te nemen", "fr": "Apporter ses propres contenants n’est pas permis", @@ -543,39 +535,9 @@ "ja": "独自の容器を持参することはできません", "ru": "Приносить свою тару не разрешено" } - } - ], - "condition": "cuisine=friture" - }, - { - "question": { - "nl": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?", - "en": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?
", - "ja": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
", - "fr": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?
" - }, - "mappings": [ - { - "if": "bulk_purchase=yes", - "then": { - "nl": "Je mag je eigen containers meenemen om je bestelling in mee te nemen en zo minder afval te maken", - "en": "You can bring your own containers to get your order, saving on single-use packaging material and thus waste", - "ja": "自分の容器を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます", - "fr": "Vous pouvez apporter vos contenants pour votre commande, limitant l’usage de matériaux à usage unique et les déchets" - } }, { - "if": "bulk_purchase=no", - "then": { - "nl": "Je mag geen eigen containers meenemen om je bestelling in mee te nemen", - "en": "Bringing your own container is not allowed", - "ja": "独自の容器を持参することはできません", - "ru": "Приносить свою тару не разрешено", - "fr": "Apporter ses propres contenants n’est pas permis" - } - }, - { - "if": "bulk_purchase=only", + "if": "reusable_packaging:accept=only", "then": { "nl": "Je moet je eigen containers meenemen om je bestelling in mee te nemen.", "en": "You must bring your own container to order here.", diff --git a/langs/layers/en.json b/langs/layers/en.json index 56209e7d4..2b0d29467 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -1721,14 +1721,20 @@ "10": { "question": "Does this restaurant have a vegetarian option?" }, - "15": { - "question": "If you bring your own container (such as a cooking pot and small pots), is it used to package your order?
", + "12": { + "question": "Does this restaurant offer a halal menu?", "mappings": { "0": { - "then": "You can bring your own containers to get your order, saving on single-use packaging material and thus waste" + "then": "There are no halal options available" }, "1": { - "then": "Bringing your own container is not allowed" + "then": "There is a small halal menu" + }, + "2": { + "then": "There is a halal menu" + }, + "3": { + "then": "Only halal options are available" } } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index acacb191d..2e6157a1c 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -864,11 +864,11 @@ }, "food": { "tagRenderings": { - "12": { + "13": { "question": "Cette friterie est-elle équipée de snacks végétariens ?", "mappings": { "0": { - "then": "Des collations végétariennes sont disponibles" + "then": "Des collations végétariens sont disponibles" }, "1": { "then": "Quelques snacks végétariens seulement" @@ -878,7 +878,7 @@ } } }, - "13": { + "14": { "question": "Cette friterie est-elle équipée de snacks végétaliens ?", "mappings": { "0": { @@ -892,7 +892,7 @@ } } }, - "14": { + "15": { "question": "Cette friteuse fonctionne-t-elle avec de la graisse animale ou végétale ?", "mappings": { "0": { @@ -900,20 +900,6 @@ }, "1": { "then": "Graisse animale" - }, - "2": { - "then": "Pas d'en-cas végétaliens disponibles" - } - } - }, - "15": { - "question": "Est-il proposé d’utiliser ses propres contenants pour sa commande ?
", - "mappings": { - "0": { - "then": "Vous pouvez apporter vos contenants pour votre commande, limitant l’usage de matériaux à usage unique et les déchets" - }, - "1": { - "then": "Apporter ses propres contenants n’est pas permis" } } }, diff --git a/langs/layers/ja.json b/langs/layers/ja.json index 7c0994195..00b50bd68 100644 --- a/langs/layers/ja.json +++ b/langs/layers/ja.json @@ -17,17 +17,6 @@ }, "food": { "tagRenderings": { - "15": { - "question": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
", - "mappings": { - "0": { - "then": "自分の容器を持ってきて、注文を受け取ることができ、使い捨ての梱包材を節約して、無駄を省くことができます" - }, - "1": { - "then": "独自の容器を持参することはできません" - } - } - }, "16": { "question": "お客様が持参容器(調理用の鍋や小さな鍋など)をもってきた場合は、注文の梱包に使用されますか?
", "mappings": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 3253f5832..99fc72c19 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -1720,6 +1720,23 @@ } }, "12": { + "question": "Heeft dit restaurant halal opties?", + "mappings": { + "0": { + "then": "Er zijn geen halal opties aanwezig" + }, + "1": { + "then": "Er zijn een beperkt aantal halal opties" + }, + "2": { + "then": "Halal menu verkrijgbaar" + }, + "3": { + "then": "Enkel halal opties zijn beschikbaar" + } + } + }, + "13": { "question": "Heeft deze frituur vegetarische snacks?", "mappings": { "0": { @@ -1730,13 +1747,10 @@ }, "2": { "then": "Geen vegetarische snacks beschikbaar" - }, - "3": { - "then": "Enkel halal opties zijn beschikbaar" } } }, - "13": { + "14": { "question": "Heeft deze frituur veganistische snacks?", "mappings": { "0": { @@ -1750,7 +1764,7 @@ } } }, - "14": { + "15": { "question": "Bakt deze frituur met dierlijk vet of met plantaardige olie?", "mappings": { "0": { @@ -1758,20 +1772,6 @@ }, "1": { "then": "Dierlijk vet" - }, - "2": { - "then": "Geen veganistische snacks beschikbaar" - } - } - }, - "15": { - "question": "Als je je eigen container (bv. kookpot of kleine potjes voor saus) meeneemt, gebruikt de frituur deze dan om je bestelling in te doen?", - "mappings": { - "0": { - "then": "Je mag je eigen containers meenemen om je bestelling in mee te nemen en zo minder afval te maken" - }, - "1": { - "then": "Je mag geen eigen containers meenemen om je bestelling in mee te nemen" } } }, diff --git a/langs/layers/ru.json b/langs/layers/ru.json index 63601259f..80847e0b6 100644 --- a/langs/layers/ru.json +++ b/langs/layers/ru.json @@ -606,13 +606,6 @@ }, "food": { "tagRenderings": { - "15": { - "mappings": { - "1": { - "then": "Приносить свою тару не разрешено" - } - } - }, "16": { "mappings": { "1": {