diff --git a/content/news/_index.af.md b/content/news/_index.af.md index 9bedf575..dcfd53cc 100644 --- a/content/news/_index.af.md +++ b/content/news/_index.af.md @@ -2,6 +2,7 @@ description: "Bl op hoogte van nuwe Organic Maps-weergawes, nuus en bywerkings van ons span" extra: menu_title: Nuus +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Jongste nuus en bywerkings van ons span" diff --git a/content/news/_index.ar.md b/content/news/_index.ar.md index 748c4ffa..9b515708 100644 --- a/content/news/_index.ar.md +++ b/content/news/_index.ar.md @@ -2,6 +2,7 @@ description: "ابقَ على تواصل بأحدث الإصدارات Organic Maps والأخبار والتحديثات من فريقنا" extra: menu_title: الأخبار +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: آخر الأخبار والتحديثات من فريقنا" diff --git a/content/news/_index.ca.md b/content/news/_index.ca.md index 9cf5c55e..d18d51ab 100644 --- a/content/news/_index.ca.md +++ b/content/news/_index.ca.md @@ -2,6 +2,7 @@ description: "Seguiu les novetats de l'Organic Maps, notícies i actualitzacions del nostre equip" extra: menu_title: Notícies +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: les notícies i novetats més recents del nostre equip" diff --git a/content/news/_index.cs.md b/content/news/_index.cs.md index cd6b87c0..8c1fbe8e 100644 --- a/content/news/_index.cs.md +++ b/content/news/_index.cs.md @@ -2,6 +2,7 @@ description: "Zůstaňte v kontaktu s nejnovějšími verzemi Organic Maps, novinkami a aktualizacemi od našeho týmu" extra: menu_title: Novinky +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Nejnovější zprávy a aktualizace od našeho týmu" diff --git a/content/news/_index.de.md b/content/news/_index.de.md index bda35cd2..6fffe4db 100644 --- a/content/news/_index.de.md +++ b/content/news/_index.de.md @@ -2,6 +2,7 @@ description: "Bleibe auf dem Laufenden mit den neuesten Veröffentlichungen von Organic Maps, Neuigkeiten und Updates von unserem Team" extra: menu_title: Neuigkeiten +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Neueste Nachrichten und Updates von unserem Team" diff --git a/content/news/_index.es.md b/content/news/_index.es.md index 83d5d4b9..dd4bdc96 100644 --- a/content/news/_index.es.md +++ b/content/news/_index.es.md @@ -2,6 +2,7 @@ description: "Permanezca al tanto de los últimos lanzamientos de Organic Maps, las noticias y las actualizaciones de nuestro equipo" extra: menu_title: Noticias +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: noticias y actualizaciones más recientes de nuestro equipo" diff --git a/content/news/_index.eu.md b/content/news/_index.eu.md index 5ea24971..5e769f78 100644 --- a/content/news/_index.eu.md +++ b/content/news/_index.eu.md @@ -2,6 +2,7 @@ description: "Mantendu informatuta gure taldearen azken bertsio-publikazio, albiste eta eguneraketekin" extra: menu_title: Berriak +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: azken albiste eta eguneraketak gure lan-taldetik" diff --git a/content/news/_index.fr.md b/content/news/_index.fr.md index b7e1d5b9..bee5c8f0 100644 --- a/content/news/_index.fr.md +++ b/content/news/_index.fr.md @@ -1,6 +1,7 @@ --- title: "Organic Maps: Dernières nouvelles et mises à jour de notre équipe" description: Restez en contact avec les dernières versions de Organic Maps, les nouvelles et les mises à jour de notre équipe +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.hi.md b/content/news/_index.hi.md index 24993d40..d1d1a1bc 100644 --- a/content/news/_index.hi.md +++ b/content/news/_index.hi.md @@ -2,6 +2,7 @@ description: "हमारी टीम के आधुनिकतम ऑर्गेनिक मानचित्र रिलीज़, समाचार, एवम अपडेट के संपर्क में रहें" extra: menu_title: समाचार +template: news/list.html page_template: news/page.html sort_by: date title: "ऑर्गेनिक मैप्स: हमारी टीम से नवीनतम समाचार और अपडेट" diff --git a/content/news/_index.hu.md b/content/news/_index.hu.md index 09e8628e..854c8086 100644 --- a/content/news/_index.hu.md +++ b/content/news/_index.hu.md @@ -2,6 +2,7 @@ description: "Maradjon kapcsolatban a legfrissebb Organic Maps kiadványokkal, hírekkel és frissítésekkel csapatunktól" extra: menu_title: Hírek +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Legfrissebb hírek és újdonságok a csapatunktól" diff --git a/content/news/_index.id.md b/content/news/_index.id.md index fb7e67c4..445ba911 100644 --- a/content/news/_index.id.md +++ b/content/news/_index.id.md @@ -2,6 +2,7 @@ description: "Tetap terhubung dengan rilis Organic Maps terbaru, berita dan pembaruan dari tim kami" extra: menu_title: Berita +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Berita dan pembaruan terbaru dari tim kami" diff --git a/content/news/_index.it.md b/content/news/_index.it.md index 4c14c93d..dfd1e740 100644 --- a/content/news/_index.it.md +++ b/content/news/_index.it.md @@ -1,6 +1,7 @@ --- title: "Organic Maps: Ultime notizie e aggiornamenti dal nostro team" description: Rimanete in contatto con gli ultimi rilasci di app, le novità e gli aggiornamenti del nostro team +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.md b/content/news/_index.md index 1884a3fb..4f79eb8b 100644 --- a/content/news/_index.md +++ b/content/news/_index.md @@ -1,6 +1,7 @@ --- title: "Organic Maps: Latest news and updates from our team" description: Stay in touch with the latest Organic Maps releases, news and updates from our team +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.nl.md b/content/news/_index.nl.md index bed41a83..fbefe9ac 100644 --- a/content/news/_index.nl.md +++ b/content/news/_index.nl.md @@ -2,6 +2,7 @@ description: "Blijf op de hoogte van nieuwe Organic Maps versies, nieuws en updates van ons team" extra: menu_title: Nieuws +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Laatste nieuws en updates van ons team" diff --git a/content/news/_index.pl.md b/content/news/_index.pl.md index 1cf94bd7..5e1c4551 100644 --- a/content/news/_index.pl.md +++ b/content/news/_index.pl.md @@ -2,6 +2,7 @@ description: "Bądź na bieżąco z najnowszymi wydaniami Organic Maps, wiadomościami i aktualizacjami od naszego zespołu" extra: menu_title: Nowości +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Najnowsze wiadomości i aktualizacje od naszego zespołu" diff --git a/content/news/_index.pt-BR.md b/content/news/_index.pt-BR.md index 372e0427..6a2a24e6 100644 --- a/content/news/_index.pt-BR.md +++ b/content/news/_index.pt-BR.md @@ -2,6 +2,7 @@ description: "Fique atualizado com os últimos lançamentos, notícias e atualizações do Organic Maps" extra: menu_title: Notícias +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Últimas notícias e atualizações de nossa equipe" diff --git a/content/news/_index.ru.md b/content/news/_index.ru.md index c612323f..714fa806 100644 --- a/content/news/_index.ru.md +++ b/content/news/_index.ru.md @@ -1,6 +1,7 @@ --- title: "Organic Maps: Свежие новости и обновления от нашей команды" description: Оставайтесь в курсе последних обновлений и новостей от нашей команды +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.sv.md b/content/news/_index.sv.md index a6c68d61..e95ca5d0 100644 --- a/content/news/_index.sv.md +++ b/content/news/_index.sv.md @@ -2,6 +2,7 @@ description: "Håll dig uppdaterad med de senaste versionerna av Organic Maps, nyheter samt uppdateringar från vårt team" extra: menu_title: Nyheter +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: De senaste nyheterna och uppdateringarna från vårt team" diff --git a/content/news/_index.tr.md b/content/news/_index.tr.md index db583c9f..8b93bd8a 100644 --- a/content/news/_index.tr.md +++ b/content/news/_index.tr.md @@ -1,6 +1,7 @@ --- title: "Organic Maps: Ekibimizden son haberler ve güncellemeler" description: Ekibimizin en son Organic Maps bültenleri, haberleri ve güncellemeleri ile iletişimde kalın +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.uk.md b/content/news/_index.uk.md index a7b881cd..e1139b0c 100644 --- a/content/news/_index.uk.md +++ b/content/news/_index.uk.md @@ -2,6 +2,7 @@ description: "Залишайтеся на зв'язку з останніми випусками Organic Maps, новинами та оновленнями від нашої команди" extra: menu_title: Новини +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps: Останні новини та оновлення від нашої команди" diff --git a/content/news/_index.zh-CN.md b/content/news/_index.zh-CN.md index 5c49cdc5..99fff4eb 100644 --- a/content/news/_index.zh-CN.md +++ b/content/news/_index.zh-CN.md @@ -1,6 +1,7 @@ --- title: "有机地图:我们团队的最新消息和更新" description: 与我们团队的最新有机地图发布、新闻和更新保持联系 +template: news/list.html page_template: news/page.html sort_by: date extra: diff --git a/content/news/_index.zh-Hans.md b/content/news/_index.zh-Hans.md index e7092c58..14252a62 100644 --- a/content/news/_index.zh-Hans.md +++ b/content/news/_index.zh-Hans.md @@ -2,6 +2,7 @@ description: "关注Organic Maps新版发布、新闻和更新" extra: menu_title: 新闻 +template: news/list.html page_template: news/page.html sort_by: date title: "Organic Maps:近期新闻和更新" diff --git a/templates/base.html b/templates/base.html index f0b71a7e..74b2918f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,11 @@ {%- set resource_path = resource.path %} {%- set resource_title = resource.name %} {%- elif taxonomy %}{# taxonomy has only 'name' and 'slug' properties #} -{% set resource = taxonomy.name ~ "/_index.md" %} +{% if lang == 'en' %} + {% set resource = taxonomy.name ~ "/_index.md" %} +{% else %} + {% set resource = taxonomy.name ~ "/_index." ~ lang ~ ".md" %} +{% endif %} {% set resource = get_section(path=resource) %} {%- set resource_title = resource.title %} {%- set resource_path = resource.path %} diff --git a/templates/news/list.html b/templates/news/list.html index 3bcc64e2..cba61621 100644 --- a/templates/news/list.html +++ b/templates/news/list.html @@ -1,4 +1,4 @@ -{# Taxonomy template to render /news/ #} +{# Taxonomy and section template to render /news/ #} {% extends 'base.html' %} {% block content %} diff --git a/templates/news/single.html b/templates/news/single.html index 65d54c62..c94cc24b 100644 --- a/templates/news/single.html +++ b/templates/news/single.html @@ -2,9 +2,13 @@ {% extends 'base.html' %} {% block content %} - {# TODO: Localize titles #} {# TODO: Show articles tagged for the en language if they are missing for the other language #} - {% set rootNewsSection = get_section(path="news/_index.md") %} + {% if lang == 'en' %} + {% set rootNewsSection = "news/_index.md" %} + {% else %} + {% set rootNewsSection = "news/_index." ~ lang ~ ".md" %} + {% endif %} + {% set rootNewsSection = get_section(path=rootNewsSection) %}