diff options
| -rw-r--r-- | askbot/conf/email_text.py | 8 | ||||
| -rw-r--r-- | askbot/templates/email/welcome_lamson_off.html | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/askbot/conf/email_text.py b/askbot/conf/email_text.py index 143dc35d..30be2982 100644 --- a/askbot/conf/email_text.py +++ b/askbot/conf/email_text.py @@ -12,8 +12,8 @@ EMAIL_TEXT = livesettings.ConfigurationGroup( settings.register( livesettings.StringValue( EMAIL_TEXT, - 'EMAIL_TEXT_SHORT_WELCOME_TO_SITE', - description = _('Short welcome message'), + 'EMAIL_TEXT_SHORT_WELCOME', + description = _('Short welcome message, for subject line'), default = _('Welcome to {{ SITE_NAME }}!'), help_text = _( '<b>NOTE: All email text settings allow placeholders: {{ USER_NAME }}, {{ SITE_NAME }} and {{ SITE_LINK }}.</b>' @@ -24,8 +24,8 @@ settings.register( settings.register( livesettings.LongStringValue( EMAIL_TEXT, - 'EMAIL_TEXT_LONG_WELCOME_TO_SITE_NORESP', - description = _('Longer welcome message, not respondable'), + 'EMAIL_TEXT_LONG_WELCOME', + description = _('Longer welcome message, for email body'), default = _('<p>Please visit {{ SITE_NAME }} at {{ SITE_LINK }}, we look forward to your posts.</p>'), ) ) diff --git a/askbot/templates/email/welcome_lamson_off.html b/askbot/templates/email/welcome_lamson_off.html index 0b1c3e5a..dfa6f6ca 100644 --- a/askbot/templates/email/welcome_lamson_off.html +++ b/askbot/templates/email/welcome_lamson_off.html @@ -3,11 +3,11 @@ {# site_name - is short name of the site, email_code - address portion of the reply email used for this message, we scan to the last appearance of the email code to detect the response signature that will appear under #} -{% set welcome_msg = settings.EMAIL_TEXT_SHORT_WELCOME_TO_SITE|sub_vars(recipient_user) %} +{% set welcome_msg = settings.EMAIL_TEXT_SHORT_WELCOME|sub_vars(recipient_user) %} {% block title %}{{ welcome_msg }}{% endblock %} {% block headline %}{% trans %}{{ welcome_msg }}{% endblock %} {% block content %} - {{ settings.EMAIL_TEXT_LONG_WELCOME_TO_SITE_NORESP|sub_vars(recipient_user) }} + {{ settings.EMAIL_TEXT_LONG_WELCOME|sub_vars(recipient_user) }} {% endblock %} {% block footer %} {% include "email/footer.html" %} |