fix: Emails should translate into server language

Fixes #1589
kiwitcms · Mar 25, 2021 · a97c1ea · a97c1ea
1 parent 63733c2
commit a97c1ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tcms/core/utils/mailto.py b/tcms/core/utils/mailto.py
@@ -4,8 +4,10 @@
 from django.conf import settings
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
+from django.utils.translation import override
 
 
+@override(settings.LANGUAGE_CODE)
 def mailto(  # pylint: disable=invalid-name
     template_name,
     subject,

diff --git a/tcms/kiwi_auth/forms.py b/tcms/kiwi_auth/forms.py
@@ -8,6 +8,7 @@
 from django.contrib.sites.models import Site
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import override
 
 from tcms.core.utils import request_host_link
 from tcms.core.utils.mailto import mailto
@@ -56,6 +57,7 @@ def save(self, commit=True):
     def set_activation_key(self):
         return UserActivationKey.set_random_key_for_user(user=self.instance)
 
+    @override(settings.LANGUAGE_CODE)
     def send_confirm_mail(self, request, activation_key):
         current_site = Site.objects.get(pk=settings.SITE_ID)
         confirm_url = "%s%s" % (