Fix Date to timeString conversion (#306)

* Add date format with AM/PM * Set locale
StepicOrg · Jun 27, 2018 · 39e4446 · 39e4446
1 parent e17b0f7
commit 39e4446
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Stepic/NSDateExtensions.swift b/Stepic/NSDateExtensions.swift
@@ -25,12 +25,21 @@ extension Date {
 extension TimeInterval {
     init(timeString: String) {
         let formatter = DateFormatter()
-        formatter.timeZone = TimeZone(secondsFromGMT: 0)
-        formatter.locale = Locale(identifier: "en_US")
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
-        if (formatter.date(from: timeString)?.timeIntervalSince1970) == nil {
-            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")!
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+
+        let dateFormats = ["yyyy-MM-dd'T'HH:mm:ss'Z'",
+                           "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                           "yyyy-MM-dd'T'hh:mm:ss.SSS a'Z'"]
+
+        for dateFormat in dateFormats {
+            formatter.dateFormat = dateFormat
+            if let timeInterval = formatter.date(from: timeString)?.timeIntervalSince1970 {
+                self = timeInterval
+                return
+            }
         }
+
         self = formatter.date(from: timeString)!.timeIntervalSince1970
     }
 }
diff --git a/Stepic/Parser.swift b/Stepic/Parser.swift
@@ -44,6 +44,7 @@ class Parser: NSObject {
     func timedateStringFromDate(date: Date) -> String {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+        dateFormatter.locale = Locale(identifier: "en_US_POSIX")
         dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
         return dateFormatter.string(from: date)
     }