From 84dee0aaba3e62b510db053d3064a44794b6ad3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A9rez-Su=C3=A1rez?= Date: Mon, 27 Aug 2018 20:23:01 +0100 Subject: [PATCH] Set all tokens and translation links needed by workshop layout --- _includes/workshop_ad.html | 6 +++--- _includes/workshop_footer.html | 2 +- _layouts/workshop.html | 26 ++++++++++++++++++++++---- assets/i18n/en.md | 3 +++ assets/i18n/es.md | 3 +++ 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/_includes/workshop_ad.html b/_includes/workshop_ad.html index e8e72e3..ea40ac1 100644 --- a/_includes/workshop_ad.html +++ b/_includes/workshop_ad.html @@ -12,16 +12,16 @@

{{page.venue}}

- Instructors: + {{ include.language.instructors }}: {% if page.instructor %} {{page.instructor | join: ', ' %}} {% else %} - to be announced. + {{ include.language.tba }}. {% endif %}

{% if page.helper %}

- Helpers: + {{ include.language.helpers }}: {{page.helper | join: ', ' %}}

{% endif %} diff --git a/_includes/workshop_footer.html b/_includes/workshop_footer.html index 5390ac1..0c43159 100644 --- a/_includes/workshop_footer.html +++ b/_includes/workshop_footer.html @@ -19,7 +19,7 @@

- Contact The Carpentries + {{ include.language.contact }}

diff --git a/_layouts/workshop.html b/_layouts/workshop.html index 5e4787d..dcc3a00 100644 --- a/_layouts/workshop.html +++ b/_layouts/workshop.html @@ -3,8 +3,26 @@ {% include base_path.html %} {% include gh_variables.html %} +{% comment %} +In which language is the current page? Guess from the path: locale="//". +Load language tockens for menus {{ data_language }}. Translations need to provide a lang.md file that translates what's under _data/language.yaml +Generate list of episodes and extras for the language shown. - NOTE: _extras need in the permlinks //page!! +{% endcomment %} +{% if page.path contains "_locale" %} + {% assign locale = page.path | remove: "_locale/" | split: "/" | first | downcase %} + {% assign pathLocale = locale | append: '/' | prepend: '/' %} + {% assign episodes = site.locale | where_exp:"item", "item.path contains pathLocale" | where_exp:"item", "item.path contains 'episode'" | sort: "path" %} + {% assign extras = site.locale | where_exp:"item", "item.path contains pathLocale" | where_exp:"item", "item.path contains 'extra'" | sort: "path" %} +{% else %} + {% assign locale = "en" %} + {% assign episodes = site.episodes %} + {% assign extras = site.extras %} +{% endif %} +{% assign lang_file = locale | append: '.md' %} +{% assign data_language = site.pages | where_exp:"page", "page.path contains 'i18n'" | where_exp:"page", "page.path contains lang_file" | first %} +{% assign data_language_en = site.pages | where_exp:"page", "page.path contains 'i18n'" | where_exp:"page", "page.path contains 'en.md'" | first %} - + @@ -46,10 +64,10 @@
- {% include navbar.html %} - {% include workshop_ad.html %} + {% include navbar.html language=data_language language_en=data_language_en episodes=episodes extras=extras locale=locale %} + {% include workshop_ad.html language=data_language %} {{ content }} - {% include workshop_footer.html %} + {% include workshop_footer.html language=data_language %}
{% include javascript.html %} diff --git a/assets/i18n/en.md b/assets/i18n/en.md index 6429f11..e2eedfd 100644 --- a/assets/i18n/en.md +++ b/assets/i18n/en.md @@ -30,4 +30,7 @@ objectives: "Objectives" downloadLesson: "Download files required for the lesson" finish: "Finish" scheduleDisclaimer: "The actual schedule may vary slightly depending on the topics and exercises chosen by the instructor." +instructors: "Instructors" +helpers: "Helpers" +tba: "to be announced" --- diff --git a/assets/i18n/es.md b/assets/i18n/es.md index d04620f..919d7ea 100644 --- a/assets/i18n/es.md +++ b/assets/i18n/es.md @@ -30,4 +30,7 @@ objectives: Objectivos downloadLesson: "Descarga los ficheros necesarios para la lección" finish: "Fin" scheduleDisclaimer: El horario durante la lección puede variar a según los temas y preguntas que eliga el instructor. +instructors: "Instructores" +helpers: "Ayudantes" +tba: "Aún pendiente" ---