Simplify passing site title to the mail templates

Signed-off-by: Michal Čihař <michal@cihar.com>

weblate/accounts/models.py

@@ -41,7 +41,7 @@ from weblate.trans.models import Project, Change, Unit
 from weblate.trans.util import get_site_url, get_distinct_translations
 from weblate.accounts.avatar import get_user_display
 import weblate
-from weblate.appsettings import ANONYMOUS_USER_NAME
+from weblate.appsettings import ANONYMOUS_USER_NAME, SITE_TITLE
 
 
 def notify_merge_failure(subproject, error, status):
@@ -215,6 +215,7 @@ def send_notification_email(language, email, notification,
                 translation_obj.get_absolute_url()
             )
         context['subject_template'] = subject_template
+        context['site_title'] = SITE_TITLE
 
         # Render subject
         subject = render_to_string(subject_template, context).strip()

weblate/html/mail/activation.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}This is an automatic email to help you complete your registration with {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}This is an automatic email to help you complete your registration with {{ site_title }}.{% endblocktrans %}
 </p>
 
 <p>

weblate/html/mail/activation.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}This is an automatic email to help you complete your registration with {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}This is an automatic email to help you complete your registration with {{ site_title }}.{% endblocktrans %}
 
 {% blocktrans %}Please open the following link in your web browser. If the link is split over several lines, you may need to copy it in the address bar.{% endblocktrans %}
 

weblate/html/mail/activation_subject.txt

-{% load i18n %}{% load translations %}{% blocktrans with site|site_title as site_title %}Your registration on {{ site_title }}{% endblocktrans %}
+{% load i18n %}{% load translations %}{% blocktrans %}Your registration on {{ site_title }}{% endblocktrans %}

weblate/html/mail/changed_translation.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there has been a change in translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a change in translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 </p>
 
 <table>

weblate/html/mail/changed_translation.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{%trans "Hi,"%}
 
-{% blocktrans with site|site_title as site_title %}there has been a change in translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a change in translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Source string:" %}
 

weblate/html/mail/merge_failure.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there has been a merge failure on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a merge failure on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
 <p>
 
 

weblate/html/mail/merge_failure.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there has been a merge failure on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a merge failure on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Error message:" %}
 

weblate/html/mail/new_comment.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there has been a new comment on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a new comment on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
 </p>
 
 <table>

weblate/html/mail/new_comment.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there has been a new comment on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a new comment on {{ subproject }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Source string:" %}
 

weblate/html/mail/new_contributor.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title and user.first_name as username %}{{ username }} has just made a first contribution on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans and user.first_name as username %}{{ username }} has just made a first contribution on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 <p>
 
 {% include "mail/footer.html" %}

weblate/html/mail/new_contributor.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title and user.first_name as username %}{{ username }} has just made a first contribution on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans and user.first_name as username %}{{ username }} has just made a first contribution on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% endfilter%}{% endautoescape %}{% include "mail/footer.txt" %}

weblate/html/mail/new_language.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there has been a request for new language on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a request for new language on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 </p>
 
 <table>

weblate/html/mail/new_language.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there has been a request for new language on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a request for new language on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Requested language:" %}
 

weblate/html/mail/new_string.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there are new strings to translate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there are new strings to translate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 <p>
 
 {% include "mail/footer.html" %}

weblate/html/mail/new_string.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there are new strings to translate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there are new strings to translate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% endfilter%}{% endautoescape %}{% include "mail/footer.txt" %}

weblate/html/mail/new_suggestion.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there is a new suggestion to evaluate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there is a new suggestion to evaluate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 <p>
 
 <table>

weblate/html/mail/new_suggestion.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there is a new suggestion to evaluate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there is a new suggestion to evaluate on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Source string:" %}
 

weblate/html/mail/new_translation.html

@@ -9,7 +9,7 @@
 </p>
 
 <p>
-{% blocktrans with site|site_title as site_title %}there has been a new translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a new translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 </p>
 
 <table>

weblate/html/mail/new_translation.txt

 {% load url from future %}{% load i18n %}{% load translations %}{% autoescape off %}{% filter wordwrap:72 %}{% trans "Hi," %}
 
-{% blocktrans with site|site_title as site_title %}there has been a new translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
+{% blocktrans %}there has been a new translation on {{ translation }} at {{ site_title }}.{% endblocktrans %}
 
 {% trans "Source string:" %}
 

weblate/trans/templatetags/translations.py

@@ -183,15 +183,6 @@ def fmtsourcediff(value, other):
     return fmttranslation(other.source, diff=value)
 
 
-@register.filter
-@stringfilter
-def site_title(value):
-    '''
-    Returns site title
-    '''
-    return appsettings.SITE_TITLE
-
-
 @register.simple_tag
 def check_name(check):
     '''