From a4ed6d719c5c5e96d5051718b429be54daddcd50 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 3 Feb 2012 17:09:52 -0500 Subject: [PATCH] Change default long date/time formats (issue 50) --- distrib/gitblit.properties | 2 +- docs/04_releases.mkd | 4 ++++ src/com/gitblit/wicket/WicketUtils.java | 2 +- src/com/gitblit/wicket/pages/BlamePage.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index 17774a21..f6a8650e 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -253,7 +253,7 @@ web.datestampLongFormat = EEEE, MMMM d, yyyy # # # SINCE 0.5.0 -web.datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z +web.datetimestampLongFormat = EEEE, MMMM d, yyyy HH:mm Z # Mount URL parameters # This setting controls if pretty or parameter URLs are used. diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 2081f3b6..2d465bc3 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -4,6 +4,10 @@ **%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit]   *released %BUILDDATE%* +#### changes + +- web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50) + #### additions - Allow relinking HEAD to a branch or a tag (Github/plm) diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index 59a94500..fb05d3ff 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -492,7 +492,7 @@ public class WicketUtils { public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) { String format = GitBlit.getString(Keys.web.datetimestampLongFormat, - "EEEE, MMMM d, yyyy h:mm a z"); + "EEEE, MMMM d, yyyy HH:mm Z"); DateFormat df = new SimpleDateFormat(format); if (timeZone != null) { df.setTimeZone(timeZone); diff --git a/src/com/gitblit/wicket/pages/BlamePage.java b/src/com/gitblit/wicket/pages/BlamePage.java index 5462b882..d76181d2 100644 --- a/src/com/gitblit/wicket/pages/BlamePage.java +++ b/src/com/gitblit/wicket/pages/BlamePage.java @@ -66,7 +66,7 @@ public class BlamePage extends RepositoryPage { add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId)); String format = GitBlit.getString(Keys.web.datetimestampLongFormat, - "EEEE, MMMM d, yyyy h:mm a z"); + "EEEE, MMMM d, yyyy HH:mm Z"); final DateFormat df = new SimpleDateFormat(format); df.setTimeZone(getTimeZone()); List lines = DiffUtils.blame(getRepository(), blobPath, objectId); -- 2.39.5