From 7bea4fa8cec1cbdbfcd5ff20580a879cf69b2787 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 29 Nov 2011 21:53:33 -0300
Subject: incremented revision and fixed email subject line for the instant
 alerts - so that they fall into threads in the email clients

---
 askbot/__init__.py              |  2 +-
 askbot/doc/source/changelog.rst |  6 +++++-
 askbot/models/__init__.py       | 19 +------------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/askbot/__init__.py b/askbot/__init__.py
index e66d44c3..9686b5f5 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -9,7 +9,7 @@ import smtplib
 import sys
 import logging
 
-VERSION = (0, 7, 31)
+VERSION = (0, 7, 32)
 
 #necessary for interoperability of django and coffin
 try:
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index a844ec09..9d64c5e0 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,8 +1,12 @@
 Changes in Askbot
 =================
 
-0.7.31 (Current Version)
+0.7.32 (Current Version)
 ------------------------
+* Bugfixes in English locale (Evgeny)
+
+0.7.31 
+------
 * Added ``askbot_create_test_fixture`` management command (Dejan Noveski)
 * Integrated new test fixture into the page load test cases (Dejan Noveski)
 * Added an embeddable widget for the questions list matching tags (Daniel Mican, Evgeny Fadeev, Dejan Noveski)
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 16b43dcd..d63acc61 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -2178,35 +2178,17 @@ def format_instant_notification_email(
     if update_type == 'question_comment':
         assert(isinstance(post, Comment))
         assert(isinstance(post.content_object, Question))
-        subject_line = _(
-                    'Re: "%(title)s"'
-                ) % {'title': origin_post.title}
     elif update_type == 'answer_comment':
         assert(isinstance(post, Comment))
         assert(isinstance(post.content_object, Answer))
-        subject_line = _(
-                    'Re: "%(title)s"'
-                ) % {'title': origin_post.title}
     elif update_type == 'answer_update':
         assert(isinstance(post, Answer))
-        subject_line = _(
-                    'Re: "%(title)s"'
-                ) % {'title': origin_post.title}
     elif update_type == 'new_answer':
         assert(isinstance(post, Answer))
-        subject_line = _(
-                    'Re: "%(title)s"'
-                ) % {'title': origin_post.title}
     elif update_type == 'question_update':
         assert(isinstance(post, Question))
-        subject_line = _(
-                    'Question: "%(title)s"'
-                ) % {'title': origin_post.title}
     elif update_type == 'new_question':
         assert(isinstance(post, Question))
-        subject_line = _(
-                    'Question: "%(title)s"'
-                ) % {'title': origin_post.title}
     else:
         raise ValueError('unexpected update_type %s' % update_type)
 
@@ -2250,6 +2232,7 @@ def format_instant_notification_email(
         'origin_post_title': origin_post.title,
         'user_subscriptions_url': user_subscriptions_url,
     }
+    subject_line = _('"%(title)s"') % {'title': origin_post.title}
     return subject_line, template.render(Context(update_data))
 
 #todo: action
-- 
cgit v1.2.3-1-g7c22