Commit 18594915 by Alex Dusenbery Committed by GitHub

Merge pull request #47 from edx/aed/django1.8.18

Django==1.8.18, jam the language_code into settings.
parents eba7f63c 83f9d4d2
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
notifier.db notifier.db
*.DS_Store *.DS_Store
notifier.log notifier.log
venvs
\ No newline at end of file
...@@ -163,7 +163,9 @@ class Command(BaseCommand): ...@@ -163,7 +163,9 @@ class Command(BaseCommand):
generate_and_send_digests.delay( generate_and_send_digests.delay(
some_users, some_users,
from_datetime, from_datetime,
to_datetime) to_datetime,
language=settings.LANGUAGE_CODE
)
user_batch = [] user_batch = []
for user in users: for user in users:
......
...@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__) ...@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
@celery.task(rate_limit=settings.FORUM_DIGEST_TASK_RATE_LIMIT, max_retries=settings.FORUM_DIGEST_TASK_MAX_RETRIES) @celery.task(rate_limit=settings.FORUM_DIGEST_TASK_RATE_LIMIT, max_retries=settings.FORUM_DIGEST_TASK_MAX_RETRIES)
def generate_and_send_digests(users, from_dt, to_dt): def generate_and_send_digests(users, from_dt, to_dt, language=None):
""" """
This task generates and sends forum digest emails to multiple users in a This task generates and sends forum digest emails to multiple users in a
single background operation. single background operation.
...@@ -33,6 +33,7 @@ def generate_and_send_digests(users, from_dt, to_dt): ...@@ -33,6 +33,7 @@ def generate_and_send_digests(users, from_dt, to_dt):
`from_dt` and `to_dt` are datetime objects representing the start and end `from_dt` and `to_dt` are datetime objects representing the start and end
of the time window for which to generate a digest. of the time window for which to generate a digest.
""" """
settings.LANGUAGE_CODE = language or settings.LANGUAGE_CODE
users_by_id = dict((str(u['id']), u) for u in users) users_by_id = dict((str(u['id']), u) for u in users)
msgs = [] msgs = []
try: try:
...@@ -150,6 +151,6 @@ def do_forums_digests(self): ...@@ -150,6 +151,6 @@ def do_forums_digests(self):
try: try:
for user_batch in batch_digest_subscribers(): for user_batch in batch_digest_subscribers():
generate_and_send_digests.delay(user_batch, from_dt, to_dt) generate_and_send_digests.delay(user_batch, from_dt, to_dt, language=settings.LANGUAGE_CODE)
except UserServiceException, e: except UserServiceException, e:
raise do_forums_digests.retry(exc=e) raise do_forums_digests.retry(exc=e)
...@@ -184,7 +184,7 @@ class TasksTestCase(TestCase): ...@@ -184,7 +184,7 @@ class TasksTestCase(TestCase):
task_result = do_forums_digests.delay() task_result = do_forums_digests.delay()
self.assertTrue(task_result.successful()) self.assertTrue(task_result.successful())
self.assertEqual(t.delay.call_count, 2) self.assertEqual(t.delay.call_count, 2)
t.delay.assert_called_with([usern(10)], dt1, dt2) t.delay.assert_called_with([usern(10)], dt1, dt2, language=settings.LANGUAGE_CODE)
@override_settings(FORUM_DIGEST_TASK_BATCH_SIZE=10) @override_settings(FORUM_DIGEST_TASK_BATCH_SIZE=10)
......
Django==1.8 Django==1.8.18
amqp==1.4.7 amqp==1.4.7
APScheduler==3.0.4 APScheduler==3.0.4
autopep8==1.2.1 autopep8==1.2.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment