diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -345,6 +345,14 @@ short_id = lambda x: x[:12] hide_credentials = lambda x: ''.join(credentials_filter(x)) +def fmt_date(date): + if date: + return (date.strftime(_(u"%a, %d %b %Y %H:%M:%S").encode('utf8')) + .decode('utf8')) + + return "" + + def is_git(repository): if hasattr(repository, 'alias'): _type = repository.alias diff --git a/rhodecode/templates/admin/admin_log.html b/rhodecode/templates/admin/admin_log.html --- a/rhodecode/templates/admin/admin_log.html +++ b/rhodecode/templates/admin/admin_log.html @@ -25,7 +25,7 @@ %endif - ${l.action_date} + ${h.fmt_date(l.action_date)} ${l.user_ip} %endfor diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html --- a/rhodecode/templates/admin/users/users.html +++ b/rhodecode/templates/admin/users/users.html @@ -46,7 +46,7 @@ ${h.link_to(user.username,h.url('edit_user', id=user.user_id))} ${user.name} ${user.lastname} - ${user.last_login} + ${h.fmt_date(user.last_login)} ${h.bool2icon(user.active)} ${h.bool2icon(user.admin)} ${h.bool2icon(bool(user.ldap_dn))} diff --git a/rhodecode/templates/bookmarks/bookmarks_data.html b/rhodecode/templates/bookmarks/bookmarks_data.html --- a/rhodecode/templates/bookmarks/bookmarks_data.html +++ b/rhodecode/templates/bookmarks/bookmarks_data.html @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))} - ${book[1].date} + ${h.fmt_date(book[1].date)} ${h.person(book[1].author)}
diff --git a/rhodecode/templates/branches/branches_data.html b/rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html +++ b/rhodecode/templates/branches/branches_data.html @@ -17,7 +17,7 @@ h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${branch[1].date} + ${h.fmt_date(branch[1].date)} ${h.person(branch[1].author)}
@@ -35,7 +35,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - ${branch[1].date} + ${h.fmt_date(branch[1].date)} ${h.person(branch[1].author)}
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -57,7 +57,7 @@
${h.shorter(h.person(cs.author),22)}
-
${cs.date}
+
${h.fmt_date(cs.date)}
${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -31,7 +31,7 @@ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
- ${c.changeset.date} + ${h.fmt_date(c.changeset.date)}
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -40,7 +40,7 @@
gravatar
${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
${h.person(cs.author)}
- ${cs.date} + ${h.fmt_date(cs.date)}
${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}
%endfor diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html +++ b/rhodecode/templates/files/files_browser.html @@ -95,7 +95,7 @@ %if node.is_file(): - + ${h.age(node.last_changeset.date)} %endif diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html +++ b/rhodecode/templates/files/files_source.html @@ -16,7 +16,7 @@
-
${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}
+
${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}
${h.format_byte_size(c.file.size,binary=True)}
${c.file.mimetype}
diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html +++ b/rhodecode/templates/index_base.html @@ -89,7 +89,7 @@ ##LAST CHANGE DATE - ${h.age(repo['last_change'])} + ${h.age(repo['last_change'])} ##LAST REVISION diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html --- a/rhodecode/templates/journal/journal_data.html +++ b/rhodecode/templates/journal/journal_data.html @@ -24,7 +24,7 @@
${h.literal(h.action_parser(entry)[1]())}
-
${h.age(entry.action_date)}
+
${h.age(entry.action_date)}
%endfor
diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html --- a/rhodecode/templates/shortlog/shortlog_data.html +++ b/rhodecode/templates/shortlog/shortlog_data.html @@ -19,7 +19,7 @@ h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), title=cs.message)} - + ${h.age(cs.date)} ${h.person(cs.author)} diff --git a/rhodecode/templates/tags/tags_data.html b/rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html +++ b/rhodecode/templates/tags/tags_data.html @@ -18,7 +18,7 @@
- ${tag[1].date} + ${h.fmt_date(tag[1].date)} ${h.person(tag[1].author)}