Mercurial > kallithea

changeset 2445:9b623dcddb02 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Format datetime in notifications according to unified function
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 11 Jun 2012 23:23:32 +0200
parents 81c29d269aed
children c4c36060d5f0
files rhodecode/lib/helpers.py rhodecode/model/notification.py
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/helpers.py	Sun Jun 10 18:18:30 2012 +0200
+++ b/rhodecode/lib/helpers.py	Mon Jun 11 23:23:32 2012 +0200
@@ -44,6 +44,7 @@
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset
+from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.db import URL_SEP
 
 log = logging.getLogger(__name__)
@@ -350,8 +351,8 @@
 
 def fmt_date(date):
     if date:
-        return (date.strftime(_(u"%a, %d %b %Y %H:%M:%S").encode('utf8'))
-            .decode('utf8'))
+        _fmt = _(u"%a, %d %b %Y %H:%M:%S").encode('utf8')
+        return date.strftime(_fmt).decode('utf8')
 
     return ""
 
--- a/rhodecode/model/notification.py	Sun Jun 10 18:18:30 2012 +0200
+++ b/rhodecode/model/notification.py	Mon Jun 11 23:23:32 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
@@ -181,12 +180,12 @@
             notification.TYPE_REGISTRATION: _('registered in RhodeCode')
         }
 
-        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,