diff --git a/databags/translate.ini b/databags/translate.ini index 1db17e5034..283465d3bc 100644 --- a/databags/translate.ini +++ b/databags/translate.ini @@ -95,7 +95,7 @@ speaking_after_title = , giving a presentation entitled keynoting_before_title = will be keynoting keynoting_after_title = , giving a presentation entitled tutorial_before_title = will be presenting a tutorial at -tutorial_ater_title = entitled +tutorial_after_title = entitled sprint_helping = will be at the sprints, and will be more than willing to help First Time Contributors earn their own shiny sprint_helping_plural = will be at the sprints, and will be more than willing to help First Time Contributors earn their own shiny diff --git a/templates/event.html b/templates/event.html index 860d114718..1c0980208d 100644 --- a/templates/event.html +++ b/templates/event.html @@ -34,11 +34,11 @@
{{ this.speaker|join(t_and)}} {{ t_speaking_before_title }} {{ this.title }}{{ t_speaking_after_title }} "{{ this.talk_title }}". +
{{ this.speaker|join(t_and)}} {{ t_speaking_before_title }} {{ this.title }} {{ t_speaking_after_title }} "{{ this.talk_title }}". {% elif this.event_type == "keynote" %} -
{{ this.speaker|join(t_and)}} {{ t_keynoting_before_title }} {{ this.title }}{{ t_keynoting_after_title }} "{{ this.talk_title }}". +
{{ this.speaker|join(t_and)}} {{ t_keynoting_before_title }} {{ this.title }} {{ t_keynoting_after_title }} "{{ this.talk_title }}". {% elif this.event_type == "tutorial" %} -
{{ this.speaker|join(t_and)}} {{ t_tutorial_before_title }} {{ this.title }}{{ t_tutorial_after_title }} "{{ this.talk_title }}". +
{{ this.speaker|join(t_and)}} {{ t_tutorial_before_title }} {{ this.title }} {{ t_tutorial_after_title }} "{{ this.talk_title }}". {% elif this.event_type == "sprint" %}
{{ t_running_sprint }} {{ this.title }}.
{{ this.speaker|join(t_and) }} {% if this.speaker|length > 1 %}{{ t_sprint_helping_plural }}{% else %}{{ t_sprint_helping }}{% endif %} {{ t_challenge_coin }}. diff --git a/templates/macros/translation.html b/templates/macros/translation.html index bf3fba0e42..93d826f112 100644 --- a/templates/macros/translation.html +++ b/templates/macros/translation.html @@ -1,3 +1,3 @@ {% macro transbag(bag_name, alt, key, alt_default='en') %} -{{ bag(bag_name, alt, key)|default(bag(bag_name, alt_default, key), true) }} +{{ bag(bag_name, alt, key)|default(bag(bag_name, alt_default, key), true)|default("", true)}} {% endmacro %}