Merge pull request #3639 from robhudson/fix-welcome-email-2

Bug 1217208 - Ensure we're using jingo when rendering emails

kuma/users/tasks.py

@@ -4,11 +4,11 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.core.mail import EmailMultiAlternatives
-from django.template.loader import render_to_string
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 from djcelery_transactions import task as transaction_task
 
+from kuma.core.email_utils import render_email
 from kuma.core.utils import strings_are_translated
 
 
@@ -29,10 +29,10 @@ def send_welcome_email(user_pk, locale):
         context = {'username': user.username}
         log.debug('Using the locale %s to send the welcome email', locale)
         with translation.override(locale):
-            content_plain = render_to_string('users/email/welcome/plain.ltxt',
-                                             context)
-            content_html = render_to_string('users/email/welcome/html.ltxt',
-                                            context)
+            content_plain = render_email('users/email/welcome/plain.ltxt',
+                                         context)
+            content_html = render_email('users/email/welcome/html.ltxt',
+                                        context)
 
             email = EmailMultiAlternatives(
                 _('Take the next step to get involved on MDN!'),

settings.py

@@ -521,7 +521,7 @@ def JINJA_CONFIG():
         # Details: http://jinja.pocoo.org/2/documentation/api#bytecode-cache
         # and in the errors you get when you try it the other way.
         bc = jinja2.MemcachedBytecodeCache(cache._cache,
-                                           "%s:j3:" % settings.CACHE_PREFIX)
+                                           "%s:j4:" % settings.CACHE_PREFIX)
         config['cache_size'] = -1  # Never clear the cache
         config['bytecode_cache'] = bc
     return config