Merge pull request watchdogpolska#2304 from watchdogpolska/develop

v1.5.54 fix template tags replacement

Author: PiotrIw

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.5.52"
+__version__ = "1.5.54"
 
 
 # Compatibility to eg. django-rest-framework

feder/letters/models.py

@@ -332,14 +332,18 @@ def send_new_case(cls, case):
         return letter
 
     def _email_context(self):
-        body = self.body.replace("{{EMAIL}}", self.case.email)
-        body = self.body.replace("{{ADRESAT}}", self.case.institution.name)
-        html_body = self.html_body.replace("{{EMAIL}}", self.case.email)
-        html_body = self.html_body.replace("{{ADRESAT}}", self.case.institution.name)
-        quote = self.quote.replace("{{EMAIL}}", self.case.email)
-        quote = quote.replace("{{ADRESAT}}", self.case.institution.name)
-        html_quote = self.html_quote.replace("{{EMAIL}}", self.case.email)
-        html_quote = self.html_quote.replace("{{ADRESAT}}", self.case.institution.name)
+        body = self.body.replace("{{EMAIL}}", self.case.email).replace(
+            "{{ADRESAT}}", self.case.institution.name
+        )
+        html_body = self.html_body.replace("{{EMAIL}}", self.case.email).replace(
+            "{{ADRESAT}}", self.case.institution.name
+        )
+        quote = self.quote.replace("{{EMAIL}}", self.case.email).replace(
+            "{{ADRESAT}}", self.case.institution.name
+        )
+        html_quote = self.html_quote.replace("{{EMAIL}}", self.case.email).replace(
+            "{{ADRESAT}}", self.case.institution.name
+        )
         context = {
             "html_body": mark_safe(html_body),
             "text_body": mark_safe(body),