Merge pull request #64 from mbehrle/fix/email_templates_jinja

Improving email templates.
openlabs · Jun 23, 2014 · ec17e5a · ec17e5a
2 parents 9fa0b7a + a86eb06
commit ec17e5a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/templates/webshop/emails/activation-html.jinja b/templates/webshop/emails/activation-html.jinja
@@ -3,17 +3,20 @@ Dear {% endtrans %} {{ nereid_user.display_name }} {% trans %},
 <br/>
 Thank you for signing up. {% endtrans %}
 <br/>
+<br/>
 {% trans %}
 To verify your account please
 {% endtrans %}
 <a href="{{ nereid_user.get_activation_link(_external=True) }}">{% trans %}click here {% endtrans %}</a>
+{% trans %}
 or copy and paste it to your browser:
+{% endtrans %}
 <br/>
 {{ nereid_user.get_activation_link(_external=True) }}
 <br/>
+<br/>
 {% trans %}
-Thanks
+Thanks,
 <br/>
-
 Team
 {% endtrans %}
diff --git a/templates/webshop/emails/activation-text.jinja b/templates/webshop/emails/activation-text.jinja
@@ -11,7 +11,7 @@ and paste it to your browser:
 {{ nereid_user.get_activation_link(_external=True) }}
 
 {% trans %}
-Thanks
+Thanks,
 
 Team
 {% endtrans %}
diff --git a/templates/webshop/emails/sale-confirmation-html.jinja b/templates/webshop/emails/sale-confirmation-html.jinja
@@ -1,16 +1,22 @@
 {% trans %}
-Dear {{ nereid_user.display_name }},
+Dear {% endtrans %} {{ nereid_user.display_name }}{% trans %},
 <br/>
-Thank you for shopping from our store.
 <br/>
-To view your order details please
-<a href="{{ url_for('sale.sale.render', active_id=sale.id, access_code=sale.guest_access_code, _external=True) }}"> click here </a>
+Thank you for shopping from our store.{% endtrans %}
+<br/>
+{% trans %}
+To view your order details please 
+{% endtrans %}
+<a href="{{ url_for('sale.sale.render', active_id=sale.id, access_code=sale.guest_access_code, _external=True) }}">{% trans %}click here {% endtrans %}</a>
+{% trans %}
 or copy and paste it to your browser:
+{% endtrans %}
 <br/>
 {{ url_for('sale.sale.render', active_id=sale.id, access_code=sale.guest_access_code, _external=True) }}
 <br/>
-
-Thanks
+<br/>
+{% trans %}
+Thanks,
 <br/>
 
 Team

diff --git a/templates/webshop/emails/sale-confirmation-text.jinja b/templates/webshop/emails/sale-confirmation-text.jinja
@@ -1,14 +1,17 @@
 {% trans %}
-Dear {{ nereid_user.display_name }},
+Dear {% endtrans %} {{ nereid_user.display_name }}{% trans %},
 
-Thank you for shopping from our store.
+Thank you for shopping from our store.{% endtrans %}
 
+{% trans %}
 To view your order details please click on the link below or copy
 and paste it to your browser:
+{% endtrans %}
 
 {{ url_for('sale.sale.render', active_id=sale.id, access_code=sale.guest_access_code, _external=True) }}
 
-Thanks
+{% trans %}
+Thanks,
 
 Team
 {% endtrans %}