добавил переменую в тело письма

apps/emencia/django/newsletter/mailer.py

@@ -167,7 +167,12 @@ class NewsLetterSender(object):
         all the attached files.
         """
 
-        content_html = self.build_email_content(contact, announce_context, name)
+        content_html = self.build_email_content(contact, announce_context)
+        content_html = content_html.format(
+            **{
+                'name': name or contact.first_name or contact.last_name or _(u'Подписчик')
+            }
+        )
 
         h = HTMLParser.HTMLParser()
         content_html = h.unescape(content_html)
@@ -392,7 +397,7 @@ class NewsLetterSender(object):
             title = self.newsletter.title2.format(**self.preheader_ctx)
         return title
 
-    def build_email_content(self, contact, announce_context=None, name=None):
+    def build_email_content(self, contact, announce_context=None):
         """Generate the mail for a contact"""
         uidb36, token = tokenize(contact)
         context = Context({'contact': contact,
@@ -400,7 +405,6 @@ class NewsLetterSender(object):
                            'newsletter': self.newsletter,
                            'tracking_image_format': TRACKING_IMAGE_FORMAT,
                            'uidb36': uidb36, 'token': token,
-                           'name': name or contact.first_name or contact.last_name or _(u'Подписчик'),
                            'settings_links': self.settings_links,
                            })
         if self.announce:

proj/settings.py

@@ -435,28 +435,6 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
-# TODO automate crons
-"""
-# update search indexes
-0 * * * * /usr/bin/python /var/www/proj/manage.py update_index conference --remove --age=6
-0 * * * * /usr/bin/python /var/www/proj/manage.py update_index exposition --remove --age=6
-0 1,13 * * * /usr/bin/python /var/www/proj/manage.py update_index place_exposition --remove --age=24
-0 3 * * * /usr/bin/python /var/www/proj/manage.py update_index company --remove --age=48
-0 4 * * * /usr/bin/python /var/www/proj/manage.py update_index theme --remove --age=48
-0 5 * * * /usr/bin/python /var/www/proj/manage.py update_index tag --remove --age=48
-0 6 * * * /usr/bin/python /var/www/proj/manage.py update_index country --remove --age=48
-0 7 * * * /usr/bin/python /var/www/proj/manage.py update_index city --remove --age=48
-# update banner logs
-10 * * * * /usr/bin/python /var/www/proj/manage.py banner_log_update
-20 2,14 * * * /usr/bin/python /var/www/proj/manage.py banner_log_check_previous_day
-# update hotels prices
-20 1 * * 6 /usr/bin/python /var/www/proj/manage.py update_hotels_price
-# newsletter
-20 * * * * /usr/bin/python /var/www/proj/manage.py send_newsletter
-40 6 * * * /usr/bin/python /var/www/proj/manage.py newsletter_contacts_remove_notactivated
-
-"""
-
 THUMBNAIL_ENGINE = "proj.sorlengine.SorlEngine"
 THUMBNAIL_FORMAT = "PNG"
 

templates/c_admin/newsletters/newsletter_object.html

@@ -65,6 +65,8 @@
                 <i class="icon-info-sign"></i>{% trans "Доступные параметры для прехедера" %}:
                 <p>{% trans "{name} - имя пользователя" %}</p>
                 <p>{% trans "{themes} - темы на которые пользователь подписан (первые 3 + кол-во оставшихся)" %}</p>
+                <i class="icon-info-sign"></i>{% trans "Доступные параметры для контента" %}:
+                <p>{% trans "{name} - имя пользователя" %}</p>
             </div>
 
             <div class="box-content">