Change default long date/time formats (issue 50)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 17774a2184abcbfa7b7ce40ccdf9d72f37869ba6..f6a8650e2db696c697269e3f739871b4d0533bbe 100644 (file)
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -253,7 +253,7 @@ web.datestampLongFormat = EEEE, MMMM d, yyyy
 # <http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html>\r
 #\r
 # SINCE 0.5.0\r
-web.datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z\r
+web.datetimestampLongFormat = EEEE, MMMM d, yyyy HH:mm Z\r
 \r
 # Mount URL parameters\r
 # This setting controls if pretty or parameter URLs are used.\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 2081f3b66bef54bb205bb6c803181f4699478a42..2d465bc3913d872b9a9a822c23442d00028f9499 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -4,6 +4,10 @@
 \r
 **%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%*\r
 \r
+#### changes\r
+\r
+- web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50)\r
+\r
 #### additions\r
 \r
 - Allow relinking HEAD to a branch or a tag (Github/plm)\r

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 59a94500ba7916523fea9fd7ebe47e215588da4b..fb05d3ff32f00c5f166a89e312ebd605faaf1595 100644 (file)
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -492,7 +492,7 @@ public class WicketUtils {
 \r
        public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) {\r
                String format = GitBlit.getString(Keys.web.datetimestampLongFormat,\r
-                               "EEEE, MMMM d, yyyy h:mm a z");\r
+                               "EEEE, MMMM d, yyyy HH:mm Z");\r
                DateFormat df = new SimpleDateFormat(format);\r
                if (timeZone != null) {\r
                        df.setTimeZone(timeZone);\r

diff --git a/src/com/gitblit/wicket/pages/BlamePage.java b/src/com/gitblit/wicket/pages/BlamePage.java
index 5462b8827525b820cc2880646ce7ab15ac90fe40..d76181d296b159edffa3a5e83d596ae482c1db27 100644 (file)
--- 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));\r
 \r
                String format = GitBlit.getString(Keys.web.datetimestampLongFormat,\r
-                               "EEEE, MMMM d, yyyy h:mm a z");\r
+                               "EEEE, MMMM d, yyyy HH:mm Z");\r
                final DateFormat df = new SimpleDateFormat(format);\r
                df.setTimeZone(getTimeZone());\r
                List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId);\r