|
|
@@ -19,6 +19,10 @@
|
|
|
|
|
|
(def custom-formatter (tf/formatter "yyyy-MM-dd'T'HH:mm:ssZZ"))
|
|
|
|
|
|
+(def ^:private mmm-do-yyyy-formatter (tf/formatter "MMM do, yyyy"))
|
|
|
+(def ^:private yyyy-MM-dd-formatter (tf/formatter "yyyy-MM-dd"))
|
|
|
+(def ^:private yyyy-MM-dd-HH-mm-formatter (tf/formatter "yyyy-MM-dd HH:mm"))
|
|
|
+
|
|
|
(defn journal-title-formatters
|
|
|
[]
|
|
|
(common-date/journal-title-formatters (state/get-date-formatter)))
|
|
|
@@ -36,7 +40,7 @@
|
|
|
(->> (cond->> input
|
|
|
(string? input) (tf/parse (tf/formatters :date-time-no-ms)))
|
|
|
(t/to-default-time-zone)
|
|
|
- (tf/unparse (tf/formatter "MMM do, yyyy")))
|
|
|
+ (tf/unparse mmm-do-yyyy-formatter))
|
|
|
(catch :default _e
|
|
|
nil)))
|
|
|
|
|
|
@@ -67,7 +71,7 @@
|
|
|
|
|
|
(defn journal-name-s [s]
|
|
|
(try
|
|
|
- (journal-name (tf/parse (tf/formatter "yyyy-MM-dd") s))
|
|
|
+ (journal-name (tf/parse yyyy-MM-dd-formatter s))
|
|
|
(catch :default _e
|
|
|
(log/error :parse-journal-date {:message "Unable to parse date to journal name, skipping."
|
|
|
:date-str s})
|
|
|
@@ -159,7 +163,7 @@
|
|
|
(defn int->local-time-2
|
|
|
[n]
|
|
|
(tf/unparse
|
|
|
- (tf/formatter "yyyy-MM-dd HH:mm")
|
|
|
+ yyyy-MM-dd-HH-mm-formatter
|
|
|
(t/to-default-time-zone (tc/from-long n))))
|
|
|
|
|
|
(def iso-parser (tf/formatter "yyyy-MM-dd'T'HH:mm:ss.SSSS'Z'"))
|