fix: make every communication email inherit from base template

django-oscar · Apr 23, 2024 · 89d157e · 89d157e
1 parent 6461913
commit 89d157e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/src/oscar/templates/oscar/communication/emails/commtype_order_placed_body.txt b/src/oscar/templates/oscar/communication/emails/commtype_order_placed_body.txt
@@ -1,4 +1,7 @@
-{% load currency_filters i18n url_tags %}{% blocktrans with order_number=order.number %}Hello,
+{% extends "oscar/communication/emails/base.txt" %}
+{% load currency_filters i18n url_tags %}
+{% block body %}
+{% blocktrans with order_number=order.number %}Hello,
 
 We are pleased to confirm your order {{ order_number }} has been received and
 will be processed shortly.{% endblocktrans %}
@@ -23,3 +26,4 @@ will be processed shortly.{% endblocktrans %}
 {% endif %}
 
 {% blocktrans %}The team{% endblocktrans %}
+{% endblock %}
diff --git a/src/oscar/templates/oscar/communication/emails/commtype_product_alert_body.txt b/src/oscar/templates/oscar/communication/emails/commtype_product_alert_body.txt
@@ -1,4 +1,7 @@
-{% load i18n %}{% load url_tags %}{% if alert.user and alert.user.get_short_name %}{% blocktrans with name=alert.user.get_short_name %}Dear {{ name }},{% endblocktrans %}{% else %}{% trans "Hello," %}{% endif %}
+{% extends "oscar/communication/emails/base.txt" %}
+{% load i18n url_tags %}
+{% block body %}
+{% if alert.user and alert.user.get_short_name %}{% blocktrans with name=alert.user.get_short_name %}Dear {{ name }},{% endblocktrans %}{% else %}{% trans "Hello," %}{% endif %}
 {% absolute_url site.domain alert.product.get_absolute_url as url %}
 {% blocktrans with title=alert.product.get_title|safe url=url %}
 We are happy to inform you that our product '{{ title }}' is back in stock:
@@ -12,3 +15,4 @@ receive any further email regarding this product.
 Thanks for your interest,
 The {{ site_name }} Team
 {% endblocktrans %}
+{% endblock %}
diff --git a/src/oscar/templates/oscar/communication/emails/commtype_product_alert_confirmation_body.txt b/src/oscar/templates/oscar/communication/emails/commtype_product_alert_confirmation_body.txt
@@ -1,5 +1,6 @@
-{% load i18n %}
-{% load url_tags %}
+{% extends "oscar/communication/emails/base.txt" %}
+{% load i18n url_tags %}
+{% block body %}
 {% absolute_url site.domain alert.get_confirm_url as confirm_url %}
 {% absolute_url site.domain alert.get_cancel_url as cancel_url %}
 {% blocktrans with title=alert.product.get_title|safe confirm_url=confirm_url cancel_url=cancel_url %}
@@ -15,3 +16,4 @@ You can cancel this alert at any time by clicking the following link:
 Thanks for your interest,
 The {{ site }} Team
 {% endblocktrans %}
+{% endblock %}
diff --git a/src/oscar/templates/oscar/communication/emails/commtype_registration_body.html b/src/oscar/templates/oscar/communication/emails/commtype_registration_body.html
@@ -1 +1,6 @@
-{% load i18n %}<p>{% trans 'Thank you for registering.' %}</p>
+{% extends "oscar/communication/emails/base.html" %}
+{% load i18n %}
+
+{% block body %}
+    <p>{% trans 'Thank you for registering.' %}</p>
+{% endblock %}
diff --git a/src/oscar/templates/oscar/communication/emails/commtype_registration_body.txt b/src/oscar/templates/oscar/communication/emails/commtype_registration_body.txt
@@ -1 +1,3 @@
-{% load i18n %}{% trans 'Thank you for registering.' %}
+{% extends "oscar/communication/emails/base.txt" %}
+{% load i18n %}
+{% block body %}{% trans 'Thank you for registering.' %}{% endblock %}