Mercurial > kallithea
diff rhodecode/model/notification.py @ 2447:4753a3445ff7 codereview
merge with beta
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 11 Jun 2012 23:28:22 +0200 |
parents | fd0a822481ec 9b623dcddb02 |
children | d04243e932cc |
line wrap: on
line diff
--- a/rhodecode/model/notification.py Mon Jun 11 23:10:34 2012 +0200 +++ b/rhodecode/model/notification.py Mon Jun 11 23:28:22 2012 +0200 @@ -32,7 +32,6 @@ from pylons.i18n.translation import _ import rhodecode -from rhodecode.config.conf import DATETIME_FORMAT from rhodecode.lib import helpers as h from rhodecode.model import BaseModel from rhodecode.model.db import Notification, User, UserNotification @@ -209,12 +208,12 @@ _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request') } - tmpl = "%(user)s %(action)s %(when)s" + # action == _map string + tmpl = "%(user)s %(action)s at %(when)s" if show_age: when = h.age(notification.created_on) else: - DTF = lambda d: datetime.datetime.strftime(d, DATETIME_FORMAT) - when = DTF(notification.created_on) + when = h.fmt_date(notification.created_on) data = dict( user=notification.created_by_user.username,