From 6690c4917bbb786d95913bda1b59627990e60b60 Mon Sep 17 00:00:00 2001
From: Igor Eliezer <IgorEliezer@users.noreply.github.com>
Date: Thu, 10 Jan 2019 23:38:20 -0200
Subject: [PATCH 1/5] Update
---
lang/pt-br.json | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lang/pt-br.json b/lang/pt-br.json
index ebc8d46..7b57f8a 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -4,11 +4,11 @@
"category:alternative_amenities": "Equipamentos",
"category:alternative_routes": "Rotas",
"category:buildings": "Edificações",
- "category:buildings-entrances": "",
- "category:buildings-figure-ground": "",
- "category:buildings-height": "",
- "category:buildings-start_date": "",
- "category:buildings-type": "",
+ "category:buildings-entrances": "Acessos",
+ "category:buildings-figure-ground": "Cheios e vazios",
+ "category:buildings-height": "Altura",
+ "category:buildings-start_date": "Idade",
+ "category:buildings-type": "Tipologias",
"category:car_amenities": "Equipamentos",
"category:car_furniture": "Mobiliário urbano",
"category:car_maxspeed": "Velocidade máxima",
@@ -35,7 +35,7 @@
"category:index": "Índice",
"category:infrastructure": "Infraestrutura",
"category:internet": "Acesso à Internet",
- "category:law": "",
+ "category:law": "Direito",
"category:leisure": "Lazer",
"category:leisure_sport_shopping": "Lazer, esportes e compras",
"category:memorial": "Memoriais",
@@ -44,7 +44,7 @@
"category:natural": "Formações naturais",
"category:office": "Escritórios e agências",
"category:oil_gas": "Petróleo e gás",
- "category:organisations": "",
+ "category:organisations": "Organizações",
"category:other": "Outros",
"category:outdoor": "Atividades ao ar livre",
"category:phone": "Telefone",
From 38f022f8a1403ce5f3c7a28647b4274ebacf4a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Fri, 11 Jan 2019 10:07:29 +0100
Subject: [PATCH 2/5] Copy pt-br translations to categories
---
buildings-entrances.json | 3 ++-
buildings-figure-ground.json | 3 ++-
buildings-height.json | 3 ++-
buildings-start_date.json | 3 ++-
buildings-type.json | 3 ++-
law.json | 3 ++-
organisations.json | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/buildings-entrances.json b/buildings-entrances.json
index 0950f11..3313049 100644
--- a/buildings-entrances.json
+++ b/buildings-entrances.json
@@ -2,7 +2,8 @@
"type": "overpass",
"name": {
"de": "Eingänge",
- "en": "Entrances"
+ "en": "Entrances",
+ "pt-br": "Acessos"
},
"query": {
"16": [
diff --git a/buildings-figure-ground.json b/buildings-figure-ground.json
index 726fc2b..808beac 100644
--- a/buildings-figure-ground.json
+++ b/buildings-figure-ground.json
@@ -2,7 +2,8 @@
"type": "overpass",
"name": {
"de": "Schwarzplan",
- "en": "Figure-ground diagram"
+ "en": "Figure-ground diagram",
+ "pt-br": "Cheios e vazios"
},
"query": {
"16": [
diff --git a/buildings-height.json b/buildings-height.json
index 28c2e14..5ac1c3b 100644
--- a/buildings-height.json
+++ b/buildings-height.json
@@ -2,7 +2,8 @@
"type": "overpass",
"name": {
"de": "Gebäudehöhen",
- "en": "Building height"
+ "en": "Building height",
+ "pt-br": "Altura"
},
"query": {
"16": [
diff --git a/buildings-start_date.json b/buildings-start_date.json
index fadac20..704d87b 100644
--- a/buildings-start_date.json
+++ b/buildings-start_date.json
@@ -1,8 +1,9 @@
{
"type": "overpass",
"name": {
+ "de": "Gebäudealter",
"en": "Building age",
- "de": "Gebäudealter"
+ "pt-br": "Idade"
},
"query": {
"16": [
diff --git a/buildings-type.json b/buildings-type.json
index 09bb904..57045af 100644
--- a/buildings-type.json
+++ b/buildings-type.json
@@ -2,7 +2,8 @@
"type": "overpass",
"name": {
"de": "Gebäudearten",
- "en": "Building types"
+ "en": "Building types",
+ "pt-br": "Tipologias"
},
"query": {
"16": [
diff --git a/law.json b/law.json
index 02beff1..f472377 100644
--- a/law.json
+++ b/law.json
@@ -1,7 +1,8 @@
{
"type": "overpass",
"name": {
- "en": "Law"
+ "en": "Law",
+ "pt-br": "Direito"
},
"query": {
"14": [
diff --git a/organisations.json b/organisations.json
index a6652b3..cfd77b9 100644
--- a/organisations.json
+++ b/organisations.json
@@ -1,7 +1,8 @@
{
"type": "overpass",
"name": {
- "en": "Organisations"
+ "en": "Organisations",
+ "pt-br": "Organizações"
},
"query": {
"13": [
From bf6bdb29c32647b23c71476f15dd8de1ac449a2a Mon Sep 17 00:00:00 2001
From: Cybereric <Cybereric@users.noreply.github.com>
Date: Sun, 13 Jan 2019 18:44:35 +0100
Subject: [PATCH 3/5] Update fr.json
---
lang/fr.json | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/lang/fr.json b/lang/fr.json
index 07468b6..3713ae8 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -4,11 +4,11 @@
"category:alternative_amenities": "Équipement",
"category:alternative_routes": "Routes",
"category:buildings": "Bâtiments",
- "category:buildings-entrances": "",
- "category:buildings-figure-ground": "",
- "category:buildings-height": "",
- "category:buildings-start_date": "",
- "category:buildings-type": "",
+ "category:buildings-entrances": "Entrées",
+ "category:buildings-figure-ground": "Empreintes",
+ "category:buildings-height": "Hauteur",
+ "category:buildings-start_date": "Date de construction",
+ "category:buildings-type": "Type",
"category:car_amenities": "Équipements auto",
"category:car_furniture": "Fournitures automobiles",
"category:car_maxspeed": "Limites de vitesse",
@@ -19,7 +19,7 @@
"category:construction": "Constructions",
"category:craft": "Artisanat",
"category:culture": "Culture",
- "category:culture_religion": "Culture et Religion",
+ "category:culture_religion": "Culture et religion",
"category:cycle_amenities": "Équipements vélo",
"category:cycle_routes": "Itinéraires vélo",
"category:education": "Éducation",
@@ -35,16 +35,16 @@
"category:index": "",
"category:infrastructure": "Infrastructures",
"category:internet": "Internet",
- "category:law": "",
+ "category:law": "Services législatifs",
"category:leisure": "Loisirs",
- "category:leisure_sport_shopping": "Loisirs",
+ "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
"category:memorial": "Mémoriaux",
- "category:military": "Militaire",
+ "category:military": "Équipements et zones militaires",
"category:mtb-routes": "Itinéraires de VTT",
"category:natural": "Éléments naturels",
"category:office": "Bureaux",
"category:oil_gas": "Pétrole et gaz naturel",
- "category:organisations": "",
+ "category:organisations": "Organisations",
"category:other": "Autres",
"category:outdoor": "Activités de plein air",
"category:phone": "Téléphone",
@@ -57,7 +57,7 @@
"category:pt:routes": "Lignes",
"category:pt:stops": "Arrêts/Stops, Stations",
"category:pt_amenities": "Équipements",
- "category:public": "Services Publics",
+ "category:public": "Services et équipements publics",
"category:railway": "Chemins de fer",
"category:railway-electrification": "Puissance électrique ferroviaire",
"category:railway-infrastructure": "Infrastructure ferroviaire",
@@ -71,11 +71,11 @@
"category:shop": "Magasins/Boutiques",
"category:special": "Catégories spéciales",
"category:sport": "Sports",
- "category:swimming_bathing": "Natation/Baignade/Bains",
+ "category:swimming_bathing": "Natation, baignade et bains",
"category:tourism_attractions": "Tourisme",
"category:tourism_services": "Tourisme",
"category:transport": "Transports",
- "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
+ "category:transport_alternative": "Alternatif (cyclisme, randonnée, ...)",
"category:transport_car": "Transport automobile",
"category:transport_cycle": "Cyclisme",
"category:transport_pt": "Transports publics",
From b29eafd5adc1e772da58f3b630e0995f7585de61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@cg.tuwien.ac.at>
Date: Mon, 14 Jan 2019 10:31:03 +0100
Subject: [PATCH 4/5] Copy fr translations to categories
---
buildings-entrances.json | 1 +
buildings-figure-ground.json | 1 +
buildings-height.json | 1 +
buildings-start_date.json | 1 +
buildings-type.json | 1 +
culture_religion.json | 2 +-
index.json | 2 +-
law.json | 1 +
military.json | 2 +-
organisations.json | 1 +
public.json | 2 +-
swimming_bathing.json | 2 +-
transport_alternative.json | 2 +-
13 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/buildings-entrances.json b/buildings-entrances.json
index 3313049..513cef0 100644
--- a/buildings-entrances.json
+++ b/buildings-entrances.json
@@ -3,6 +3,7 @@
"name": {
"de": "Eingänge",
"en": "Entrances",
+ "fr": "Entrées",
"pt-br": "Acessos"
},
"query": {
diff --git a/buildings-figure-ground.json b/buildings-figure-ground.json
index 808beac..72a3ae6 100644
--- a/buildings-figure-ground.json
+++ b/buildings-figure-ground.json
@@ -3,6 +3,7 @@
"name": {
"de": "Schwarzplan",
"en": "Figure-ground diagram",
+ "fr": "Empreintes",
"pt-br": "Cheios e vazios"
},
"query": {
diff --git a/buildings-height.json b/buildings-height.json
index 5ac1c3b..6e3851a 100644
--- a/buildings-height.json
+++ b/buildings-height.json
@@ -3,6 +3,7 @@
"name": {
"de": "Gebäudehöhen",
"en": "Building height",
+ "fr": "Hauteur",
"pt-br": "Altura"
},
"query": {
diff --git a/buildings-start_date.json b/buildings-start_date.json
index 704d87b..a5b5055 100644
--- a/buildings-start_date.json
+++ b/buildings-start_date.json
@@ -3,6 +3,7 @@
"name": {
"de": "Gebäudealter",
"en": "Building age",
+ "fr": "Date de construction",
"pt-br": "Idade"
},
"query": {
diff --git a/buildings-type.json b/buildings-type.json
index 57045af..c7c2d85 100644
--- a/buildings-type.json
+++ b/buildings-type.json
@@ -3,6 +3,7 @@
"name": {
"de": "Gebäudearten",
"en": "Building types",
+ "fr": "Type",
"pt-br": "Tipologias"
},
"query": {
diff --git a/culture_religion.json b/culture_religion.json
index 52cc1a5..17c8e16 100644
--- a/culture_religion.json
+++ b/culture_religion.json
@@ -9,7 +9,7 @@
"en": "Culture and Religion",
"es": "Cultura y religión",
"et": "Kultuur ja religioon",
- "fr": "Culture et Religion",
+ "fr": "Culture et religion",
"hu": "Kultúra és vallás",
"it": "Cultura",
"ja": "文化",
diff --git a/index.json b/index.json
index 126668e..ba5a57d 100644
--- a/index.json
+++ b/index.json
@@ -13,7 +13,7 @@
"en": "Leisure, Sport and Shopping",
"es": "Ocio, deporte y compras",
"et": "Vaba aeg, sport ja ostmine",
- "fr": "Loisirs",
+ "fr": "Vie quotidienne, loisirs et sports",
"hu": "Szabadidő, sport és vásárlás",
"it": "Tempo libero, sport e shopping",
"ja": "レジャー",
diff --git a/law.json b/law.json
index f472377..f670988 100644
--- a/law.json
+++ b/law.json
@@ -2,6 +2,7 @@
"type": "overpass",
"name": {
"en": "Law",
+ "fr": "Services législatifs",
"pt-br": "Direito"
},
"query": {
diff --git a/military.json b/military.json
index 4c4eade..39b276a 100644
--- a/military.json
+++ b/military.json
@@ -6,7 +6,7 @@
"de": "Militär",
"el": "Στρατιωτικό",
"en": "Military",
- "fr": "Militaire",
+ "fr": "Équipements et zones militaires",
"hu": "Katonai objektumok",
"it": "Militare",
"ja": "軍事",
diff --git a/organisations.json b/organisations.json
index cfd77b9..1d73ea0 100644
--- a/organisations.json
+++ b/organisations.json
@@ -2,6 +2,7 @@
"type": "overpass",
"name": {
"en": "Organisations",
+ "fr": "Organisations",
"pt-br": "Organizações"
},
"query": {
diff --git a/public.json b/public.json
index 3adc7ff..448fb31 100644
--- a/public.json
+++ b/public.json
@@ -7,7 +7,7 @@
"el": "Δημόσιες Υπηρεσίες",
"en": "Public Services",
"et": "Kommunaalteenused",
- "fr": "Services Publics",
+ "fr": "Services et équipements publics",
"hu": "Közszolgáltatások",
"it": "Servizi pubblici",
"ja": "公共サービス",
diff --git a/swimming_bathing.json b/swimming_bathing.json
index f525711..def3505 100644
--- a/swimming_bathing.json
+++ b/swimming_bathing.json
@@ -3,7 +3,7 @@
"name": {
"de": "Schwimmen und Baden",
"en": "Swimming and bathing",
- "fr": "Natation/Baignade/Bains",
+ "fr": "Natation, baignade et bains",
"hu": "Fürdőzés, úszás",
"pt-br": "Natação e banho"
},
diff --git a/transport_alternative.json b/transport_alternative.json
index 32278c7..8736ab1 100644
--- a/transport_alternative.json
+++ b/transport_alternative.json
@@ -4,7 +4,7 @@
"cs": "Alternativní (Cyklistika, Pěší turistika, ...)",
"el": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
"et": "Alternatiivne (jalgrattasõit, matkamine, ...)",
- "fr": "Alternatif (Cyclisme, Randonnée, ...)",
+ "fr": "Alternatif (cyclisme, randonnée, ...)",
"hu": "Alternatív (Kerékpár, Túra)",
"it": "Alternativi (bicicletta, camminate, ...)",
"ja": "その他交通 (サイクリング、ハイキング、...)",
From 2ced1489eba3004df087560b82521cf20631ac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Tue, 15 Jan 2019 15:38:17 +0100
Subject: [PATCH 5/5] xmas: fix isCurrent check
---
xmas.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xmas.json b/xmas.json
index 2baa128..8da2b52 100644
--- a/xmas.json
+++ b/xmas.json
@@ -18,7 +18,7 @@
},
"feature": {
"pre": [
- "{% set isCurrent = meta.timestamp > now|date_modify('-1 month')|date('Y') %}",
+ "{% set isCurrent = meta.timestamp >= \"now\"|date_modify('-10 month')|date('Y') %}",
"{% set bgColor = isCurrent ? '#f2756a' : 'red' %}"
],
"title": "{{ attribute(tags, \"xmas:name\")|default(trans(\"unnamed\")) }}",