From db24ae4c307a549eded59010d91f34b28e0dc853 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sun, 1 May 2022 19:08:29 +0200
Subject: [PATCH] Moved mappings to correct place, add translation

---
 assets/themes/postboxes/postboxes.json | 65 ++++++++++++++------------
 langs/themes/de.json                   | 16 +++----
 langs/themes/en.json                   | 16 +++----
 langs/themes/nl.json                   |  5 ++
 4 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index a1ee435f7f..6f0764b2cb 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -63,36 +63,10 @@
           "zh_Hant": "郵筒",
           "id": "Kotak pos",
           "hu": "Postaláda",
-          "nl": "Brievenbus",
           "ca": "Bústia",
-          "es": "Buzón de correo"
-        },
-        "mappings": [
-          {
-            "if": {
-              "and": [
-                "post_office=post_partner",
-                "name="
-              ]
-            },
-            "then": {
-              "en": "Post partner at a shop",
-              "de": "Postfiliale im Einzelhandel"
-            }
-          },
-          {
-            "if": {
-              "and": [
-                "post_office=post_partner",
-                "name~*"
-              ]
-            },
-            "then": {
-              "en": "Post partner at {name}",
-              "de": "Postfiliale im {name}"
-            }
-          }
-        ]
+          "es": "Buzón de correo",
+          "nl": "Brievenbus"
+        }
       },
       "description": {
         "en": "The layer showing postboxes.",
@@ -192,7 +166,34 @@
           "nl": "Postkantoor",
           "ca": "Oficina de correus",
           "es": "Oficina de Correo"
-        }
+        },
+        "mappings": [
+          {
+            "if": {
+              "and": [
+                "post_office=post_partner",
+                "name="
+              ]
+            },
+            "then": {
+              "en": "Post partner at a shop",
+              "de": "Postfiliale im Einzelhandel",
+              "nl": "Postpartner in een winkel"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "post_office=post_partner",
+                "name~*"
+              ]
+            },
+            "then": {
+              "en": "Post partner at {name}",
+              "de": "Postfiliale im {name}"
+            }
+          }
+        ]
       },
       "description": {
         "en": "A layer showing post offices.",
@@ -528,6 +529,10 @@
             {
               "if": "opening_hours~*",
               "then": "isOpen"
+            },
+            {
+              "if": "shop~*",
+              "then": "./assets/themes/shops/shop.svg"
             }
           ],
           "iconSize": {
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 7d11415a26..662165ef2a 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -775,14 +775,6 @@
                     }
                 },
                 "title": {
-                    "mappings": {
-                        "0": {
-                            "then": "Postfiliale im Einzelhandel"
-                        },
-                        "1": {
-                            "then": "Postfiliale im {name}"
-                        }
-                    },
                     "render": "Briefkasten"
                 }
             },
@@ -815,6 +807,14 @@
                     }
                 },
                 "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "Postfiliale im Einzelhandel"
+                        },
+                        "1": {
+                            "then": "Postfiliale im {name}"
+                        }
+                    },
                     "render": "Poststelle"
                 }
             }
diff --git a/langs/themes/en.json b/langs/themes/en.json
index efc5be0bf0..f1cb0ae1ae 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -804,14 +804,6 @@
                     }
                 },
                 "title": {
-                    "mappings": {
-                        "0": {
-                            "then": "Post partner at a shop"
-                        },
-                        "1": {
-                            "then": "Post partner at {name}"
-                        }
-                    },
                     "render": "Postbox"
                 }
             },
@@ -945,6 +937,14 @@
                     }
                 },
                 "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "Post partner at a shop"
+                        },
+                        "1": {
+                            "then": "Post partner at {name}"
+                        }
+                    },
                     "render": "Post Office"
                 }
             },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index f29c2d8a43..dbcac5cc80 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -754,6 +754,11 @@
                     }
                 },
                 "title": {
+                    "mappings": {
+                        "0": {
+                            "then": "Postpartner in een winkel"
+                        }
+                    },
                     "render": "Postkantoor"
                 }
             }