Skip to content

Commit 9874f5a

Browse files
authored
Merge pull request #14220 from omartinex/fix/product-type-added-email-template
Fix email template rendering for product_type_added notification
2 parents 98005cf + 3718c7a commit 9874f5a

1 file changed

Lines changed: 52 additions & 35 deletions

File tree

Lines changed: 52 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
11
{% load i18n %}
22
{% load navigation_tags %}
33
{% load display_tags %}
4+
{% url 'view_product_type' product_type.id as product_type_url %}
5+
46
<html>
5-
<body>
6-
{% autoescape on %}
7-
<p>
8-
{% trans "Hello" %},
9-
</p>
10-
<p>
11-
{% blocktranslate trimmed prod_url=url|full_url %}
12-
The new product type "{{ title }}" has been added. It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
13-
{% endblocktranslate %}
14-
</p>
15-
<br/>
16-
<br/>
17-
{% trans "Kind regards" %},<br/>
18-
<br/>
19-
{% if system_settings.team_name %}
20-
{{ system_settings.team_name }}
21-
{% else %}
22-
Defect Dojo
23-
{% endif %}
24-
<p>
25-
<br/>
26-
<br/>
27-
<p>
28-
{% url 'notifications' as notification_url %}
29-
{% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
30-
</p>
31-
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
32-
<br/>
33-
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
34-
<span style="font-size:16pt; font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
35-
<p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
36-
</div>
37-
{% endif %}
38-
{% endautoescape %}
39-
</body>
7+
<body>
8+
{% autoescape on %}
9+
<p>
10+
{% trans "Hello" %},
11+
</p>
12+
13+
<p>
14+
{% blocktranslate trimmed with title=title prod_url=product_type_url|full_url %}
15+
The new product type "{{ title }}" has been added.
16+
It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
17+
{% endblocktranslate %}
18+
</p>
19+
20+
<br/>
21+
<br/>
22+
23+
{% trans "Kind regards" %},<br/>
24+
<br/>
25+
26+
{% if system_settings.team_name %}
27+
{{ system_settings.team_name }}
28+
{% else %}
29+
Defect Dojo
30+
{% endif %}
31+
32+
<p>
33+
<br/>
34+
<br/>
35+
</p>
36+
37+
<p>
38+
{% url 'notifications' as notification_url %}
39+
{% trans "You can manage your notification settings here" %}:
40+
<a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
41+
</p>
42+
43+
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
44+
<br/>
45+
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em;">
46+
<span style="font-size:16pt; font-family:'Cambria','times new roman','garamond',serif; color:#ff0000;">
47+
{% trans "Disclaimer" %}
48+
</span>
49+
<br/>
50+
<p style="font-size:11pt; line-height:10pt; font-family:'Cambria','times roman',serif;">
51+
{{ system_settings.disclaimer_notifications }}
52+
</p>
53+
</div>
54+
{% endif %}
55+
{% endautoescape %}
56+
</body>
4057
</html>

0 commit comments

Comments
 (0)