summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-05-31 11:49:50 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-05-31 11:49:50 -0400
commit209402f2c5086d95a760fe1007a1f34458badd99 (patch)
tree817dd0f4222b45f9ca2fdb3353d7503beff7d3bd
parent3ed2132bfc00be9769f12d9c4fda64b6b067a731 (diff)
downloadaskbot-209402f2c5086d95a760fe1007a1f34458badd99.tar.gz
askbot-209402f2c5086d95a760fe1007a1f34458badd99.tar.bz2
askbot-209402f2c5086d95a760fe1007a1f34458badd99.zip
added space around the reply with comment instruction and simplified the separator line in the email alerts
-rw-r--r--askbot/models/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 24d4a3fc..3319b9ae 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -2690,10 +2690,8 @@ def format_instant_notification_email(
can_reply = to_user.can_reply_by_email()
if can_reply:
- reply_separator = const.REPLY_SEPARATOR_TEMPLATE % {
- 'user_action': user_action,
- 'instruction': _('To reply, PLEASE WRITE ABOVE THIS LINE.')
- }
+ reply_separator = const.SIMPLE_REPLY_SEPARATOR_TEMPLATE % \
+ _('To reply, PLEASE WRITE ABOVE THIS LINE.')
if post.post_type == 'question' and alt_reply_address:
data = {
'addr': alt_reply_address,
@@ -2701,8 +2699,9 @@ def format_instant_notification_email(
('Re: ' + post.thread.title).encode('utf-8')
)
}
- reply_separator += '<br>' + \
+ reply_separator += '<p>' + \
const.REPLY_WITH_COMMENT_TEMPLATE % data
+ reply_separator += '</p>'
else:
reply_separator = user_action