diff options
Diffstat (limited to 'TalerWallet1/Helper/TalerDater.swift')
-rw-r--r-- | TalerWallet1/Helper/TalerDater.swift | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/TalerWallet1/Helper/TalerDater.swift b/TalerWallet1/Helper/TalerDater.swift index 2629900..5bde4bc 100644 --- a/TalerWallet1/Helper/TalerDater.swift +++ b/TalerWallet1/Helper/TalerDater.swift @@ -54,21 +54,29 @@ public class TalerDater: DateFormatter { } } +// public static func date(from: Timestamp) -> Date { +// let milliseconds = try from.milliseconds() +// let date = Date(milliseconds: milliseconds) +// return date +// } + /// converts a timestamp into a formatted date string - public static func dateString(from: Timestamp, relative: Bool = false) -> String { + public static func dateString(from: Timestamp, relative: Bool = false) -> (String, Date?) { do { let milliseconds = try from.milliseconds() let date = Date(milliseconds: milliseconds) +// let date = date(from: from) if relative { let now = Date.now let timeInterval = now.timeIntervalSince(date) if let relativeDate = relativeDate(from: timeInterval) { - return relativeDate + return (relativeDate, date) } } - return shared.string(from: date) + return (shared.string(from: date), date) } catch { // Never - return "Never" +// let never = LocalizedString("Never") + return ("Never", nil) } } |