summaryrefslogtreecommitdiff
path: root/src/utils.clj
diff options
context:
space:
mode:
authorScott Ostler <sbsotler@gmail.com>2011-01-28 10:34:28 -0500
committerScott Ostler <sbsotler@gmail.com>2011-01-28 10:34:28 -0500
commit870195aa045fe36b354ada921e490d3a950bb677 (patch)
treec1324ca84856c5d1718fb77d197c30e40560463c /src/utils.clj
parentc6f4043891f53692893650f5ac9c9b4875de26de (diff)
parent3a0c47ed55e96a79c5a40aeef628ec3f03d59ac8 (diff)
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'src/utils.clj')
-rwxr-xr-xsrc/utils.clj4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils.clj b/src/utils.clj
index 760ae63..ee64789 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -146,8 +146,8 @@
(defn today []
(format-yyyymmdd (new Date)))
-(def timestamp-formatter (new SimpleDateFormat "h:mm a EEE M/d"))
-(def date-first-timestamp-formatter (new SimpleDateFormat "M/d h:mm a"))
+(def timestamp-formatter (new SimpleDateFormat "hh:mm a EEE M/d"))
+(def date-first-timestamp-formatter (new SimpleDateFormat "yy/MM/dd HH:mm"))
(defn format-timestamp [d]
(.format timestamp-formatter d))