From 2f50dbdf363084e7c324102cf8bf01d707688232 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 16 May 2024 10:40:03 +0200 Subject: [PATCH] Move mappings around --- assets/layers/recycling/recycling.json | 24 ++++++++++---------- assets/layers/waste_basket/waste_basket.json | 14 ++++++------ langs/layers/ca.json | 18 +++++++-------- langs/layers/cs.json | 18 +++++++-------- langs/layers/da.json | 2 +- langs/layers/de.json | 18 +++++++-------- langs/layers/en.json | 20 ++++++++-------- langs/layers/es.json | 4 ++-- langs/layers/fr.json | 18 +++++++-------- langs/layers/id.json | 2 +- langs/layers/it.json | 14 ++++++------ langs/layers/nl.json | 20 ++++++++-------- 12 files changed, 86 insertions(+), 86 deletions(-) diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json index 9133cd093..5aef12d3a 100644 --- a/assets/layers/recycling/recycling.json +++ b/assets/layers/recycling/recycling.json @@ -1112,6 +1112,18 @@ "class": "medium" } }, + { + "if": "recycling:pmd=yes", + "ifnot": "recycling:pmd=", + "then": { + "en": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here", + "nl": "Plastic verpakkingen, metalen verpakkingen en drankpakken kunnen hier gerecycled worden" + }, + "icon": { + "path": "./assets/layers/recycling/pmd.svg", + "class": "medium" + } + }, { "if": "recycling:printer_cartridges=yes", "ifnot": "recycling:printer_cartridges=", @@ -1249,18 +1261,6 @@ "path": "./assets/layers/recycling/bicycles.svg", "class": "medium" } - }, - { - "if": "recycling:pmd=yes", - "ifnot": "recycling:pmd=", - "then": { - "en": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here", - "nl": "Plastic verpakkingen, metalen verpakkingen en drankpakken kunnen hier gerecycled worden" - }, - "icon": { - "path": "./assets/layers/recycling/pmd.svg", - "class": "medium" - } } ] }, diff --git a/assets/layers/waste_basket/waste_basket.json b/assets/layers/waste_basket/waste_basket.json index a05949a90..2f78b9c7c 100644 --- a/assets/layers/waste_basket/waste_basket.json +++ b/assets/layers/waste_basket/waste_basket.json @@ -206,6 +206,13 @@ "cs": "Odpadkový koš na plasty" } }, + { + "if": "waste=pmd", + "then": { + "en": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)", + "nl": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" + } + }, { "if": "waste=paper", "then": { @@ -219,13 +226,6 @@ "ca": "Una paperera per a paper", "cs": "Odpadový koš na papír" } - }, - { - "if": "waste=pmd", - "then": { - "en": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)", - "nl": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" - } } ] }, diff --git a/langs/layers/ca.json b/langs/layers/ca.json index a650871c5..a73fe680c 100644 --- a/langs/layers/ca.json +++ b/langs/layers/ca.json @@ -6725,28 +6725,28 @@ "16": { "then": "Aquí es pot reciclar plàstic" }, - "17": { + "18": { "then": "Els cartutxos d'impressora es poden reciclar aquí" }, - "18": { + "19": { "then": "Aquí es pot reciclar ferralla" }, - "19": { - "then": "Aquí es poden reciclar sabates" - }, "20": { - "then": "Aquí es poden reciclar petits electrodomèstics" + "then": "Aquí es poden reciclar sabates" }, "21": { "then": "Aquí es poden reciclar petits electrodomèstics" }, "22": { - "then": "Aquí es poden reciclar agulles" + "then": "Aquí es poden reciclar petits electrodomèstics" }, "23": { - "then": "Ací es pot reciclar el rebuig" + "then": "Aquí es poden reciclar agulles" }, "24": { + "then": "Ací es pot reciclar el rebuig" + }, + "25": { "then": "Aquí es poden reciclar bicicletes" } }, @@ -9121,7 +9121,7 @@ "6": { "then": "Una paperera per a plàstic" }, - "7": { + "8": { "then": "Una paperera per a paper" } }, diff --git a/langs/layers/cs.json b/langs/layers/cs.json index 4ec8e3268..cce41264c 100644 --- a/langs/layers/cs.json +++ b/langs/layers/cs.json @@ -6988,28 +6988,28 @@ "16": { "then": "Plast se zde dá recyklovat" }, - "17": { + "18": { "then": "Náplně do tiskáren lze recyklovat zde" }, - "18": { + "19": { "then": "Kovový šrot lze zde recyklovat" }, - "19": { - "then": "Boty se zde dají recyklovat" - }, "20": { - "then": "Drobné elektrospotřebiče se zde dají recyklovat" + "then": "Boty se zde dají recyklovat" }, "21": { "then": "Drobné elektrospotřebiče se zde dají recyklovat" }, "22": { - "then": "Jehly se zde dají recyklovat" + "then": "Drobné elektrospotřebiče se zde dají recyklovat" }, "23": { - "then": "Zbytkový odpad zde lze recyklovat" + "then": "Jehly se zde dají recyklovat" }, "24": { + "then": "Zbytkový odpad zde lze recyklovat" + }, + "25": { "then": "Kola se zde dají recyklovat" } }, @@ -9380,7 +9380,7 @@ "6": { "then": "Odpadkový koš na plasty" }, - "7": { + "8": { "then": "Odpadový koš na papír" } }, diff --git a/langs/layers/da.json b/langs/layers/da.json index b02ab560f..b72b0f2f0 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -2610,7 +2610,7 @@ "6": { "then": "En affaldskurv til plast" }, - "7": { + "8": { "then": "En affaldskurv til papir" } }, diff --git a/langs/layers/de.json b/langs/layers/de.json index ad012f2bc..d776b5fd7 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -8273,28 +8273,28 @@ "16": { "then": "Kunststoff kann hier recycelt werden" }, - "17": { + "18": { "then": "Druckerpatronen können hier recycelt werden" }, - "18": { + "19": { "then": "Metallschrott kann hier recycelt werden" }, - "19": { - "then": "Schuhe können hier recycelt werden" - }, "20": { - "then": "Elektrokleingeräte können hier recycelt werden" + "then": "Schuhe können hier recycelt werden" }, "21": { "then": "Elektrokleingeräte können hier recycelt werden" }, "22": { - "then": "Nadeln können hier recycelt werden" + "then": "Elektrokleingeräte können hier recycelt werden" }, "23": { - "then": "Restmüll kann hier recycelt werden" + "then": "Nadeln können hier recycelt werden" }, "24": { + "then": "Restmüll kann hier recycelt werden" + }, + "25": { "then": "Fahrräder können hier recycelt werden" } }, @@ -11166,7 +11166,7 @@ "6": { "then": "Der Abfalleimer ist für Plastik" }, - "7": { + "8": { "then": "Der Abfalleimer ist für Papier" } }, diff --git a/langs/layers/en.json b/langs/layers/en.json index 27a21918a..92077a494 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -8453,31 +8453,31 @@ "then": "Plastic can be recycled here" }, "17": { - "then": "Printer cartridges can be recycled here" + "then": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here" }, "18": { - "then": "Scrap metal can be recycled here" + "then": "Printer cartridges can be recycled here" }, "19": { - "then": "Shoes can be recycled here" + "then": "Scrap metal can be recycled here" }, "20": { - "then": "Small electrical appliances can be recycled here" + "then": "Shoes can be recycled here" }, "21": { "then": "Small electrical appliances can be recycled here" }, "22": { - "then": "Needles can be recycled here" + "then": "Small electrical appliances can be recycled here" }, "23": { - "then": "Residual waste can be recycled here" + "then": "Needles can be recycled here" }, "24": { - "then": "Bicycles can be recycled here" + "then": "Residual waste can be recycled here" }, "25": { - "then": "Plastic packaging, metal packaging and drink cartons (PMD) can be recycled here" + "then": "Bicycles can be recycled here" } }, "question": "What can be recycled here?" @@ -11374,10 +11374,10 @@ "then": "A waste basket for plastic" }, "7": { - "then": "A waste basket for paper" + "then": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)" }, "8": { - "then": "A waste basket for plastic packaging, metal packaging and drink cartons (PMD)" + "then": "A waste basket for paper" } }, "question": "What kind of waste basket is this?" diff --git a/langs/layers/es.json b/langs/layers/es.json index d2fc81df3..deb453b4f 100644 --- a/langs/layers/es.json +++ b/langs/layers/es.json @@ -3913,10 +3913,10 @@ "16": { "then": "Aquí se puede reciclar plástico" }, - "18": { + "19": { "then": "Aquí se puede reciclar chatarra" }, - "19": { + "20": { "then": "El calzado se puede reciclar aquí" } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index f64c95f63..c8f2e4440 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -5444,28 +5444,28 @@ "16": { "then": "Le plastique peut être recyclé ici" }, - "17": { + "18": { "then": "Les cartouches d'imprimante peuvent être recyclées ici" }, - "18": { + "19": { "then": "La ferraille peut être recyclée ici" }, - "19": { - "then": "Les chaussures peuvent être recyclées ici" - }, "20": { - "then": "Les petits appareils électriques peuvent être recyclés ici" + "then": "Les chaussures peuvent être recyclées ici" }, "21": { "then": "Les petits appareils électriques peuvent être recyclés ici" }, "22": { - "then": "Les aiguilles peuvent être recyclées ici" + "then": "Les petits appareils électriques peuvent être recyclés ici" }, "23": { - "then": "Les autres déchets peuvent être déposés ici" + "then": "Les aiguilles peuvent être recyclées ici" }, "24": { + "then": "Les autres déchets peuvent être déposés ici" + }, + "25": { "then": "Les vélos peuvent être recyclés ici" } }, @@ -7117,7 +7117,7 @@ "6": { "then": "Une poubelle pour plastiques" }, - "7": { + "8": { "then": "Une poubelle pour papier" } }, diff --git a/langs/layers/id.json b/langs/layers/id.json index b33cd73a2..aa5b630a9 100644 --- a/langs/layers/id.json +++ b/langs/layers/id.json @@ -855,7 +855,7 @@ "6": { "then": "Keranjang sampah untuk plastik" }, - "7": { + "8": { "then": "Keranjang sampah untuk kertas" } }, diff --git a/langs/layers/it.json b/langs/layers/it.json index ac5b0af46..f65184d76 100644 --- a/langs/layers/it.json +++ b/langs/layers/it.json @@ -2326,22 +2326,22 @@ "16": { "then": "Plastica" }, - "18": { + "19": { "then": "Rottami metallici" }, - "19": { - "then": "Scarpe" - }, "20": { - "then": "Piccoli elettrodomestici" + "then": "Scarpe" }, "21": { "then": "Piccoli elettrodomestici" }, "22": { - "then": "Aghi e oggetti appuntiti" + "then": "Piccoli elettrodomestici" }, "23": { + "then": "Aghi e oggetti appuntiti" + }, + "24": { "then": "Secco" } }, @@ -3046,7 +3046,7 @@ "6": { "then": "Un cestino rifiuti per la plastica" }, - "7": { + "8": { "then": "Un cestino rifiuti per la carta" } }, diff --git a/langs/layers/nl.json b/langs/layers/nl.json index cb7e1d405..d745ddab5 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -7033,31 +7033,31 @@ "then": "Plastic kan hier gerecycled worden" }, "17": { - "then": "Inktpatronen kunnen hier gerecycleerd worden" + "then": "Plastic verpakkingen, metalen verpakkingen en drankpakken kunnen hier gerecycled worden" }, "18": { - "then": "Oud metaal kan hier gerecycled worden" + "then": "Inktpatronen kunnen hier gerecycleerd worden" }, "19": { - "then": "Schoenen kunnen hier gerecycled worden" + "then": "Oud metaal kan hier gerecycled worden" }, "20": { - "then": "Kleine elektrische apparaten kunnen hier gerecycled worden" + "then": "Schoenen kunnen hier gerecycled worden" }, "21": { "then": "Kleine elektrische apparaten kunnen hier gerecycled worden" }, "22": { - "then": "Injectienaalden kunnen hier gerecycled worden" + "then": "Kleine elektrische apparaten kunnen hier gerecycled worden" }, "23": { - "then": "Restafval kan hier gerecycled worden" + "then": "Injectienaalden kunnen hier gerecycled worden" }, "24": { - "then": "Fietsen (en fietswrakken) kunnen hier gerecycled worden" + "then": "Restafval kan hier gerecycled worden" }, "25": { - "then": "Plastic verpakkingen, metalen verpakkingen en drankpakken kunnen hier gerecycled worden" + "then": "Fietsen (en fietswrakken) kunnen hier gerecycled worden" } }, "question": "Wat kan hier gerecycled worden?" @@ -9404,10 +9404,10 @@ "then": "Een vuilnisbak voor plastic" }, "7": { - "then": "Een vuilnisbak voor papier" + "then": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" }, "8": { - "then": "Een vuilnisbak voor plastic verpakkingen, metalen verpakkingen en drankpakken (PMD)" + "then": "Een vuilnisbak voor papier" } }, "question": "Wat voor soort vuilnisbak is dit?"