Yonk 1136 b fixes

edx_notifications/locale/ar/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -47,7 +47,9 @@ msgstr "استلام بريد إلكتروني يوميًا"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "هذا الإعداد سيؤدي لإرسال ملخص يومي بجميع الإشعارات إلى عنوان بريدك الإلكتروني المسجل"
+msgstr ""
+"هذا الإعداد سيؤدي لإرسال ملخص يومي بجميع الإشعارات إلى عنوان بريدك "
+"الإلكتروني المسجل"
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -57,4 +59,12 @@ msgstr "استلام بريد إلكتروني أسبوعيًا"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "هذا الإعداد سيؤدي لإرسال ملخص أسبوعي بجميع الإشعارات إلى عنوان بريدك الإلكتروني المسجل"
+msgstr ""
+"هذا الإعداد سيؤدي لإرسال ملخص أسبوعي بجميع الإشعارات إلى عنوان بريدك "
+"الإلكتروني المسجل"
+
+#: stores/sql/models.py:145
+#, python-brace-format
+#| msgid "Announcement on {annoucement_date}"
+msgid "Announcement on {annoucement_date}"
+msgstr "{annoucement_date} الإعلان على"

edx_notifications/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,8 +46,9 @@ msgstr "Tägliche E-Mail erhalten"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Bei dieser Einstellung wird eine tägliche Zusammenfassung aller Nachrichten an "
-"Ihre eingetragene E-Mail Adresse geschickt."
+msgstr ""
+"Bei dieser Einstellung wird eine tägliche Zusammenfassung aller Nachrichten "
+"an Ihre eingetragene E-Mail Adresse geschickt."
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -57,5 +58,11 @@ msgstr "Wöchentliche E-Mail erhalten"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Bei dieser Einstellung wird eine wöchentliche Zusammenfassung aller"
- "Nachrichten an Ihre eingetragene E-Mail Adresse geschickt."
+msgstr ""
+"Bei dieser Einstellung wird eine wöchentliche Zusammenfassung "
+"allerNachrichten an Ihre eingetragene E-Mail Adresse geschickt."
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "Ankündigung am {annoucement_date}"

edx_notifications/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: const.py:167
+msgid "Announcement"
+msgstr ""
+
 #: digests.py:200
 msgid "Receive daily email"
 msgstr ""
@@ -56,3 +60,8 @@ msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
 msgstr ""
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr ""

edx_notifications/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,8 +46,9 @@ msgstr "Recibir a diario por correo electrónico"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Esta configuración le permite seleccionar que todas las notificaciones se envíen "
-"a diario a la dirección de correo electrónico registrada."
+msgstr ""
+"Esta configuración le permite seleccionar que todas las notificaciones se "
+"envíen a diario a la dirección de correo electrónico registrada."
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -57,5 +58,11 @@ msgstr "Recibir una vez semana por correo electrónico"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Esta configuración le permite seleccionar que todas las notificaciones"
- "se envíen una vez por semana a la dirección de correo electrónico registrada."
+msgstr ""
+"Esta configuración le permite seleccionar que todas las notificacionesse "
+"envíen una vez por semana a la dirección de correo electrónico registrada."
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "anuncio el {annoucement_date}"

edx_notifications/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,7 +46,9 @@ msgstr "Recevoir un courriel quotidien"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Ce paramètre résultera en l'envoi d'un résumé quotidien de toutes les notifications à votre adresse de courriel enregistré"
+msgstr ""
+"Ce paramètre résultera en l'envoi d'un résumé quotidien de toutes les "
+"notifications à votre adresse de courriel enregistré"
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -56,4 +58,11 @@ msgstr "Recevoir un courriel hebdomadaire"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Ce paramètre résultera en l'envoi d'un résumé hebdomadaire de toutes les notifications à votre adresse de courriel enregistrée"
+msgstr ""
+"Ce paramètre résultera en l'envoi d'un résumé hebdomadaire de toutes les "
+"notifications à votre adresse de courriel enregistrée"
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "annonce le {annoucement_date}"

edx_notifications/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,7 +46,9 @@ msgstr "デイリーメールを受信する"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "この設定により、すべての通知の日々のダイジェスト版が、あなたの登録メールアドレスに送信されます。"
+msgstr ""
+"この設定により、すべての通知の日々のダイジェスト版が、あなたの登録メールアド"
+"レスに送信されます。"
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -56,4 +58,11 @@ msgstr "ウィークリーメールを受信する"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "この設定により、すべての通知の週間ダイジェスト版が、あなたの登録メールアドレスに送信されます。"
+msgstr ""
+"この設定により、すべての通知の週間ダイジェスト版が、あなたの登録メールアドレ"
+"スに送信されます。"
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "についての発表 {annoucement_date}"

edx_notifications/locale/nl/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -38,6 +38,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: const.py:167
+msgid "Announcement"
+msgstr ""
+
 #: digests.py:200
 msgid "Receive daily email"
 msgstr ""
@@ -57,3 +61,8 @@ msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
 msgstr ""
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr ""

edx_notifications/locale/pt/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -46,8 +46,9 @@ msgstr "Receber e-mail diário"
 msgid ""
 "This setting will cause a daily digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Esta configuração fará com que um resumo diário de todas as"
- "notificações seja enviado para seu endereço de e-mail registrado"
+msgstr ""
+"Esta configuração fará com que um resumo diário de todas asnotificações seja "
+"enviado para seu endereço de e-mail registrado"
 
 #: digests.py:210
 msgid "Receive weekly email"
@@ -57,5 +58,11 @@ msgstr "Receber e-mail semanal"
 msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
-msgstr "Esta configuração fará com que um resumo semanal de todas"
- "as notificações seja enviado para o seu endereço de e-mail cadastrado"
+msgstr ""
+"Esta configuração fará com que um resumo semanal de todasas notificações "
+"seja enviado para o seu endereço de e-mail cadastrado"
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "anúncio em {annoucement_date}"

edx_notifications/locale/zh-ch/LC_MESSAGES/django.po → edx_notifications/locale/zh_CN/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-30 22:48+0500\n"
+"POT-Creation-Date: 2018-11-29 17:12+0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -56,3 +56,8 @@ msgid ""
 "This setting will cause a weekly digest of all notifications to be sent to "
 "your registered email address"
 msgstr "此设置将使所有通知的每周摘要都发送到您注册的电子邮件地址"
+
+#: stores/sql/models.py:145
+#, python-brace-format
+msgid "Announcement on {annoucement_date}"
+msgstr "公告 {annoucement_date}"

edx_notifications/stores/sql/models.py

@@ -124,14 +124,27 @@ def to_data_object(self, options=None):  # pylint: disable=unused-argument
             deliver_no_earlier_than=self.deliver_no_earlier_than,
             expires_at=self.expires_at,
             expires_secs_after_read=self.expires_secs_after_read,
-            payload=DictField.from_json(self.payload),  # special case, dict<-->JSON string
+            payload=self.translate_payload_title
+            (DictField.from_json(self.payload)),  # special case, dict<-->JSON string
             created=self.created,
             resolve_links=DictField.from_json(self.resolve_links),  # special case, dict<-->JSON string
             object_id=self.object_id
         )
 
         return msg
 
+    def translate_payload_title(self, payload):
+        """
+        translate a the title of any announcement to the current course language
+        :param payload:
+        :return:
+        """
+        if payload and 'notification_type' in payload and payload['notification_type'] == "courseannouncement":
+            announcement_date = payload['announcement_date']
+            title = _('Announcement on {annoucement_date}').format(annoucement_date=announcement_date)   # pylint: disable=line-too-long, no-member
+            payload['title'] = title
+        return payload
+
     @classmethod
     def from_data_object(cls, msg):
         """

settings.py

@@ -3,8 +3,6 @@
 """
 Django settings file for local development purposes
 """
-import sys
-
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
@@ -65,7 +63,7 @@
     ('es', u'Español'),
     ('nl', u'Dutch '),
     ('pt', u'Português'),
-    ('zh-ch', u'中文(简体)'),
+    ('zh-cn', u'中文(简体)'),
     ('fr', u'Français'),
     ('jp', u'日本人'),
     ('de', u'Deutsche'),

setup.py

@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edx-notifications',
-    version='0.6.8',
+    version='0.6.9',
     description='Notification subsystem for Open edX',
     long_description=open('README.md').read(),
     author='edX',

testserver/bokchoy_settings.py

@@ -48,7 +48,7 @@
     ('es', u'Español'),
     ('nl', u'Dutch '),
     ('pt', u'Português'),
-    ('zh-ch', u'中文(简体)'),
+    ('zh-cn', u'中文(简体)'),
     ('fr', u'Français'),
     ('jp', u'日本人'),
     ('de', u'Deutsche'),