From c8a0a1fb94f3ec070f7980c8301a8a851f715038 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 8 Aug 2013 08:57:27 -0400 Subject: added language activation to the send_email_alerts management command --- askbot/management/commands/send_email_alerts.py | 3 +++ askbot/models/__init__.py | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py index 1036fa8f..e1783316 100644 --- a/askbot/management/commands/send_email_alerts.py +++ b/askbot/management/commands/send_email_alerts.py @@ -8,6 +8,7 @@ from askbot.models import Activity, EmailFeedSetting from django.template.loader import get_template from django.utils.translation import ugettext as _ from django.utils.translation import ungettext +from django.utils.translation import activate as activate_language from django.conf import settings as django_settings from askbot.conf import settings as askbot_settings from django.utils.datastructures import SortedDict @@ -411,6 +412,7 @@ class Command(NoArgsCommand): def send_email_alerts(self): #does not change the database, only sends the email #todo: move this to template + activate_language(django_settings.LANGUAGE_CODE) template = get_template('email/delayed_email_alert.html') for user in User.objects.all(): user.add_missing_askbot_subscriptions() @@ -462,6 +464,7 @@ class Command(NoArgsCommand): 'title': q.thread.title }) + activate_language(user.get_primary_language()) text = template.render({ 'recipient_user': user, 'questions': questions_data, diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 41a766b8..68eb03b5 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2417,6 +2417,12 @@ def user_get_profile_url(self, profile_section=None): def user_get_absolute_url(self): return self.get_profile_url() +def user_get_primary_language(self): + if getattr(django_settings, 'ASKBOT_MULTILINGUAL', False): + return django_settings.LANGUAGE_CODE + else: + return self.languages.split()[0] + def get_profile_link(self): profile_link = u'%s' \ % (self.get_profile_url(), escape(self.username)) @@ -3040,6 +3046,7 @@ User.add_to_class('has_affinity_to_question', user_has_affinity_to_question) User.add_to_class('moderate_user_reputation', user_moderate_user_reputation) User.add_to_class('set_status', user_set_status) User.add_to_class('get_badge_summary', user_get_badge_summary) +User.add_to_class('get_primary_language', user_get_primary_language) User.add_to_class('get_status_display', user_get_status_display) User.add_to_class('get_old_vote_for_post', user_get_old_vote_for_post) User.add_to_class('get_unused_votes_today', user_get_unused_votes_today) -- cgit v1.2.3-1-g7c22