Merge pull request #13 from plepe/master

Sync
6 years ago · 52f8556133
26 changed files with 108 additions and 33 deletions
--- a/buildings-start_date.json
+++ b/buildings-start_date.json
@ -45,7 +45,16 @@
        ],
        "description": [
            "{% if tags.start_date %}",
-            "{{ tags.start_date }}",
+            "{{ tags.start_date|osmFormatDate({ format: 'short' }) }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
+            "{% endif %}"
+        ],
+        "popupDescription": [
+            "{% if tags.start_date %}",
+            "{{ tags.start_date|osmFormatDate }}",
+            "{% else %}",
+            "{{ trans('unknown') }}",
            "{% endif %}"
        ],
        "markerSymbol": null,
@ -111,11 +120,11 @@
        "  </tr>",
        "  <tr>",
        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\", \"start_date\": \"xxx\" }))|raw }}</td>",
-        "    <td>unparseable start_date</td>",
+        "    <td>{{ repoTrans('date format not understood') }}</td>",
        "  </tr>",
        "  <tr>",
        "    <td>{{ markerPolygon(evaluate({ \"building\": \"yes\" }))|raw }}</td>",
-        "    <td>no start_date</td>",
+        "    <td>{{ trans('unknown') }}</td>",
        "  </tr>",
        "</table>"
    ]
--- a/detailsBody.html
+++ b/detailsBody.html
@ -145,7 +145,7 @@
  <li class='hasSymbol'>
   <i class="fa fa-clock-o" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('start_date') }}:</span>
-   <span class='value'>{{ enumerate(tags.start_date) }}</span>
+   <span class='value'>{{ tags.start_date|osmFormatDate }}</span>
  </li>
 {% endif %}

@ -153,7 +153,7 @@
  <li class='hasSymbol'>
   <i class="fa fa-clock-o" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('opening_date') }}:</span>
-   <span class='value'>{{ enumerate(tags.opening_date) }}</span>
+   <span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
  </li>
 {% endif %}

--- a/lang/ast.json
+++ b/lang/ast.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "Fábriques",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/ca.json
+++ b/lang/ca.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/cs.json
+++ b/lang/cs.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "Továrny",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/de.json
+++ b/lang/de.json
@ -85,5 +85,8 @@
    "category:water": "Gewässer",
    "category:wikipedia": "Wikipedia",
    "category:works": "Fabriken",
-    "category:xmas": "Weihnachten"
+    "category:xmas": "Weihnachten",
+    "date format not understood": "Datumsformat nicht erkannt",
+    "outdated feature": "Informationen nicht aktuell",
+    "xmas:outdated-warning": "Objekt wurde nicht für die aktuelle Saison aktualisiert. Bitte prüfen und das Tag 'xmas:lastcheck' auf das aktuelle Datum setzen."
 }
--- a/lang/el.json
+++ b/lang/el.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/en.json
+++ b/lang/en.json
@ -85,5 +85,8 @@
    "category:water": "Waterbodies",
    "category:wikipedia": "Wikipedia",
    "category:works": "Works",
-    "category:xmas": "Christmas"
+    "category:xmas": "Christmas",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": "Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date."
 }
--- a/lang/es.json
+++ b/lang/es.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/et.json
+++ b/lang/et.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/fr.json
+++ b/lang/fr.json
@ -85,5 +85,8 @@
    "category:water": "Hydrographie",
    "category:wikipedia": "Wikipédia",
    "category:works": "Zones industrielles",
-    "category:xmas": "Noël"
+    "category:xmas": "Noël",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/hu.json
+++ b/lang/hu.json
@ -85,5 +85,8 @@
    "category:water": "Vizek",
    "category:wikipedia": "Wikipédia",
    "category:works": "Üzemek",
-    "category:xmas": "Karácsony"
+    "category:xmas": "Karácsony",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/it.json
+++ b/lang/it.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "Fabbriche",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/ja.json
+++ b/lang/ja.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "工場",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/nl.json
+++ b/lang/nl.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "Fabrieken",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/pl.json
+++ b/lang/pl.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@ -84,6 +84,9 @@
    "category:waste": "Lixo",
    "category:water": "Hidrografia",
    "category:wikipedia": "Wikipédia",
-    "category:works": "Fábricas",
-    "category:xmas": "Natal"
+    "category:works": "Produção",
+    "category:xmas": "Natal",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/pt.json
+++ b/lang/pt.json
@ -85,5 +85,8 @@
    "category:water": "Massas de água",
    "category:wikipedia": "Wikipédia",
    "category:works": "Fábricas",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/ro.json
+++ b/lang/ro.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/ru.json
+++ b/lang/ru.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "Промышленность",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/template.json
+++ b/lang/template.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/lang/uk.json
+++ b/lang/uk.json
@ -85,5 +85,8 @@
    "category:water": "",
    "category:wikipedia": "",
    "category:works": "",
-    "category:xmas": ""
+    "category:xmas": "",
+    "date format not understood": "",
+    "outdated feature": "",
+    "xmas:outdated-warning": ""
 }
--- a/popupBody.html
+++ b/popupBody.html
@ -151,7 +151,7 @@
  <li class='hasSymbol'>
   <i class="fa fa-clock-o" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('start_date') }}:</span>
-   <span class='value'>{{ enumerate(tags.start_date) }}</span>
+   <span class='value'>{{ tags.start_date|osmFormatDate }}</span>
  </li>
 {% endif %}

@ -159,7 +159,7 @@
  <li class='hasSymbol'>
   <i class="fa fa-clock-o" aria-hidden="true"></i>
   <span class='key'>{{ keyTrans('opening_date') }}:</span>
-   <span class='value'>{{ enumerate(tags.opening_date) }}</span>
+   <span class='value'>{{ tags.opening_date|osmFormatDate }}</span>
  </li>
 {% endif %}

--- a/pt.json
+++ b/pt.json
@ -58,7 +58,7 @@
        ],
        "description": "{{ tagTrans('route', tags.route) }}",
        "body": [
-            "<h4>Stops</h4><ul>",
+            "<h4>{{ repoTrans('category:pt:stops') }}</h4><ul>",
            "{% for member in members %}",
            "{% if member.tags.highway == 'bus_stop' or member.tags.amenity == 'bus_station' or member.tags.amenity == 'ferry_terminal' or member.tags.railway == 'tram_stop' or member.tags.railway == 'halt' or member.tags.railway == 'station' or member.tags.aerialway == 'station' or member.tags.public_transport == 'stop_position' or member.role|slice(-4) == 'stop' %}",
            "<li data-object='{{ member.id }}' data-sublayer='member'><b>{% if member.tags %}{{ member.tags.name|default(trans('unknown')) }}{% else %}<i>{{ trans('loading') }}</i>{% endif %}</li>",
@ -123,7 +123,7 @@
        ],
        "title": "{% if isStop %}{{ tags.name|default(stopName)|default(id) }}{% endif %}",
        "body": [
-            "<h4>Routes</h4>",
+            "<h4>{{ repoTrans('category:pt:routes') }}</h4>",
            "<ul class='overpass-layer-list'>",
            "{% for master in masters %}",
            "  {% if master.tags.public_transport != 'stop_area' %}",
--- a/residential.json
+++ b/residential.json
@ -35,6 +35,12 @@
        ]
    },
    "feature": {
-        "description": "{{ tagTrans('landuse', tags.landuse) }}"
+        "description": [
+            "{{ tagTrans('landuse', tags.landuse) }}",
+            "",
+            "{% if tags.residential %}",
+            "({{ tagTransList('residential', tags.residential) }})",
+            "{% endif %}"
+        ]
    }
 }
--- a/xmas.json
+++ b/xmas.json
@ -25,7 +25,7 @@
        "description": "{{ tagTransList(\"xmas:feature\", attribute(tags, \"xmas:feature\")) }}",
        "body": [
            "{% if not isCurrent %}",
-            "<div style='border: 1px solid red; padding: 2px; margin-bottom: 2px;'>Feature has not been updated for the current season! Please check and set the tag 'xmas:lastcheck' to the current date.</div>",
+            "<div style='border: 1px solid red; padding: 2px; margin-bottom: 2px;'>{{ repoTrans('xmas:outdated-warning') }}</div>",
            "{% endif %}",
            "",
            "{% if attribute(tags, 'xmas:location') %}",
@ -88,7 +88,7 @@
        "{% endfor %}",
        "  <tr>",
        "    <td>{{ markerCircle({\"fillColor\":\"red\"})|raw }}</td>",
-        "    <td>outdated feature</td>",
+        "    <td>{{ repoTrans('outdated feature') }}</td>",
        "  </tr>",
        "</table>"
    ]