--- 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,