diff options
| -rw-r--r-- | askbot/management/commands/send_email_alerts.py | 5 | ||||
| -rw-r--r-- | askbot/models/__init__.py | 3 | ||||
| -rw-r--r-- | askbot/templates/email/change_settings_info.html | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py index be203a0e..31d4b949 100644 --- a/askbot/management/commands/send_email_alerts.py +++ b/askbot/management/commands/send_email_alerts.py @@ -50,7 +50,7 @@ def extend_question_list( raise ValueError('cutoff_time is a mandatory parameter') for q in src: - if languages and src.language_code not in languages: + if languages and q.language_code not in languages: continue if q in dst: meta_data = dst[q] @@ -467,7 +467,8 @@ class Command(NoArgsCommand): 'questions': questions_data, 'name': user.username, 'admin_email': django_settings.ADMINS[0][1], - 'site_name': askbot_settings.APP_SHORT_NAME + 'site_name': askbot_settings.APP_SHORT_NAME, + 'is_multilingual': django_settings.ASKBOT_MULTILINGUAL }) if DEBUG_THIS_COMMAND == True: diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index eaad3de7..8bff1321 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -3198,7 +3198,8 @@ def format_instant_notification_email( 'origin_post_title': origin_post.thread.title, 'user_subscriptions_url': site_url(user_subscriptions_url), 'reply_separator': reply_separator, - 'reply_address': reply_address + 'reply_address': reply_address, + 'is_multilingual': django_settings.ASKBOT_MULTILINGUAL } subject_line = _('"%(title)s"') % {'title': origin_post.thread.title} diff --git a/askbot/templates/email/change_settings_info.html b/askbot/templates/email/change_settings_info.html index b1f0eb32..76d630f4 100644 --- a/askbot/templates/email/change_settings_info.html +++ b/askbot/templates/email/change_settings_info.html @@ -1,6 +1,10 @@ <p style="font-size:10px; font-style:italic;"> {% set url = 'user_subscriptions'|url(recipient_user.id, recipient_user.username|slugify) %} - {% trans %}To change your email alert settings, please visit <a href="{{ url }}">your user profile</a>.{% endtrans %} + {% if is_multilingual %} + {% trans %}To change frequency, language and content of these alerts, please visit <a href="{{ url }}">your user profile</a>.{% endtrans %} + {% else %} + {% trans %}To change freqency and content of these alerts, please visit <a href="{{ url }}">your user profile</a>.{% endtrans %} + {% endif %} </p> <p style="font-size:10px; font-style:italic;"> {% trans %}If you believe that this message was sent in an error, please email about it the forum administrator at {{ admin_email }}.{% endtrans %} |