kallithea Changeset - 716550e1e4fa

Changeset - 716550e1e4fa

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-11-09 19:21:16
marcin@python-works.com

fixed way of creating notification template for better translations

1 file changed with 9 insertions and 9 deletions:

rhodecode/model/notification.py

0 comments (0 inline, 0 general)

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -208,44 +208,44 @@ class NotificationModel(BaseModel): @@
         return UserNotification.query()\
             .filter(UserNotification.notification == notification)\
             .filter(UserNotification.user == user).scalar()
     def make_description(self, notification, show_age=True):
         """
         Creates a human readable description based on properties
         of notification object
         """
         #alias
         _n = notification
         _map = {
             _n.TYPE_CHANGESET_COMMENT: _('commented on commit'),
             _n.TYPE_MESSAGE: _('sent message'),
             _n.TYPE_MENTION: _('mentioned you'),
             _n.TYPE_REGISTRATION: _('registered in RhodeCode'),
             _n.TYPE_PULL_REQUEST: _('opened new pull request'),
             _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request')
             _n.TYPE_CHANGESET_COMMENT: _('commented on commit at %(when)s'),
             _n.TYPE_MESSAGE: _('sent message at %(when)s'),
             _n.TYPE_MENTION: _('mentioned you at %(when)s'),
             _n.TYPE_REGISTRATION: _('registered in RhodeCode at %(when)s'),
             _n.TYPE_PULL_REQUEST: _('opened new pull request at %(when)s'),
             _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request at %(when)s')
+        }
         # action == _map string
-        tmpl = "%(user)s %(action)s at %(when)s"
         tmpl = "%(user)s %(action)s "
         if show_age:
             when = h.age(notification.created_on)
         else:
             when = h.fmt_date(notification.created_on)
         data = dict(
             user=notification.created_by_user.username,
-            action=_map[notification.type_], when=when,
             action=_map[notification.type_]
+        )
         return tmpl % data
+        return (tmpl % data) % {'when': when}
 class EmailNotificationModel(BaseModel):
     TYPE_CHANGESET_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_PASSWORD_RESET = 'passoword_link'
     TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_PULL_REQUEST = Notification.TYPE_PULL_REQUEST
     TYPE_PULL_REQUEST_COMMENT = Notification.TYPE_PULL_REQUEST_COMMENT
     TYPE_DEFAULT = 'default'
     def __init__(self):

0 comments (0 inline, 0 general)