Merge pull request #536 from rl-institut/release/v1.4.0

Release/v1.4.0

CHANGELOG.md

@@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.3.0]
+## [1.4.0] - 2021-01-14
+### Added
+- en translation for new design of landing page
+
+## [1.3.0] - 2020-12-14
 ### Changed
 - wording and image on mobile LP
 - added buttons on mobile LP to skip onboarding 

e_metrobus/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

e_metrobus/templates/includes/desktop.html

@@ -59,7 +59,7 @@ <h2>{% trans 'Emissionen sparen' %}</h2>
           </div>
         </div>
         <div class="text">
-          {% trans 'Erfahre, wie viel CO2, NOx und Feinstaub du im Vergleich zu anderen Verkehrsmitteln sparst' %}
+          {% trans 'Erfahre, wie viel CO<sub>2</sub>, NO<sub>x</sub> und Feinstaub du im Vergleich zu anderen Verkehrsmitteln sparst' %}
         </div>
       </div>
       <div class="cell small-4 desktop-features__item">

e_metrobus/templates/navigation/display_route.html

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.html" %}
 
 {% load static %}
 {% load i18n %}
@@ -7,7 +7,7 @@
 
 {% block body_class %}l-scroll l-scroll--nav l-scroll--nofooter{% endblock %}
 
-{% block content %}
+{% block content %}
 
 <!-- route display -->
 <div class="display-route__bg"></div>
@@ -26,7 +26,7 @@
       </p>
     </div>
   </div>
-  
+
   <div class="grid-x display__section">
     <div class="cell small-3 display-route__img">
       <img class="show-for-portrait" id="onboardingAnimateIcon2" src="{% static 'images/icons/Icon_E_Car.svg' %}" alt="{% trans 'E-Pkw' %}">
@@ -41,7 +41,7 @@
       </div>
     </div>
   </div>
-  
+
   <div class="grid-x display__section">
     <div class="cell small-3 display-route__img">
       <img class="show-for-portrait" id="onboardingAnimateIcon3" src="{% static 'images/icons/Icon_Conventional_Bus.svg' %}" alt="{% trans 'Dieselbus' %}">
@@ -56,7 +56,7 @@
       </div>
     </div>
   </div>
-  
+
   <div class="grid-x display__section">
     <div class="cell small-3 display-route__img">
       <img class="show-for-portrait" id="onboardingAnimateIcon5" src="{% static 'images/icons/Icon_Conventional_Car.svg' %}" alt="{% trans 'Pkw (Diesel)' %}">
@@ -71,7 +71,7 @@
       </div>
     </div>
   </div>
-  
+
   <div class="grid-x display__section">
     <div class="display__chart">
       <a href="{% url 'navigation:comparison' %}">{% trans 'Chart ansehen' %}</a>
@@ -82,7 +82,7 @@
   </div>
 </div>
 
-{% endblock %}
+{% endblock %}
 
 {% block javascript %}
 {{block.super}}