kallithea Changeset - 8eeb3fa7bc05

Changeset - 8eeb3fa7bc05

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 11 years ago 2014-07-18 19:22:01
madski@unity3d.com

notifications: append status changes and 'Closing' to email subjects

1 file changed with 5 insertions and 1 deletions:

kallithea/model/notification.py

0 comments (0 inline, 0 general)

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -270,43 +270,47 @@ class EmailNotificationModel(BaseModel): @@
         self.email_types = {
             self.TYPE_CHANGESET_COMMENT: 'email_templates/changeset_comment.html',
             self.TYPE_PASSWORD_RESET: 'email_templates/password_reset.html',
             self.TYPE_REGISTRATION: 'email_templates/registration.html',
             self.TYPE_DEFAULT: 'email_templates/default.html',
             self.TYPE_PULL_REQUEST: 'email_templates/pull_request.html',
             self.TYPE_PULL_REQUEST_COMMENT: 'email_templates/pull_request_comment.html',
+        }
         self._subj_map = {
             self.TYPE_CHANGESET_COMMENT: _('Comment on %(repo_name)s changeset %(short_id)s on %(branch)s by %(comment_username)s'),
             self.TYPE_MESSAGE: 'Test Message',
             # self.TYPE_PASSWORD_RESET
             self.TYPE_REGISTRATION: _('New user %(new_username)s registered'),
             # self.TYPE_DEFAULT
             self.TYPE_PULL_REQUEST: _('Review request on %(repo_name)s pull request #%(pr_id)s from %(ref)s by %(pr_username)s'),
             self.TYPE_PULL_REQUEST_COMMENT: _('Comment on %(repo_name)s pull request #%(pr_id)s from %(ref)s by %(comment_username)s'),
+        }
     def get_email_description(self, type_, **kwargs):
         """
         return subject for email based on given type
         """
         tmpl = self._subj_map[type_]
         try:
-            return tmpl % kwargs
+            subj = tmpl % kwargs
         except KeyError, e:
             log.error('error generating email subject for %r from %s: %s', type_, ','.join(self._subj_map.keys()), e)
             raise
         l = [str(x) for x in [kwargs.get('status_change'), kwargs.get('closing_pr') and _('Closing')] if x]
         if l:
             subj += ' (%s)' % (', '.join(l))
         return subj
     def get_email_tmpl(self, type_, **kwargs):
         """
         return generated template for email based on given type
         """
         base = self.email_types.get(type_, self.email_types[self.TYPE_DEFAULT])
         email_template = self._tmpl_lookup.get_template(base)
         # translator and helpers inject
         _kwargs = {'_': _,
                    'h': h,
                    'c': c}
         _kwargs.update(kwargs)
         log.debug('rendering tmpl %s with kwargs %s' % (base, _kwargs))
         return email_template.render(**_kwargs)

0 comments (0 inline, 0 general)