From 5c3b27e88eb6730891bf125315a12fa4034bd0ef Mon Sep 17 00:00:00 2001 From: Igor Kislyuk Date: Wed, 3 May 2017 13:45:21 +0300 Subject: [PATCH] Fix. Locale idea --- .../Classes/BaseDateFormatter.swift | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift index 183223e..41ef9b1 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift @@ -33,35 +33,30 @@ open class BaseDateFormatter { private static let apiFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = usedLocale dateFormatter.dateFormat = apiDateTimeFormat return dateFormatter }() private static let apiDateWithoutTimeFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = usedLocale dateFormatter.dateFormat = apiDateWithoutTimeFormat return dateFormatter }() private static let hourAndMinuteFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = usedLocale dateFormater.dateFormat = hourAndMinuteDateTimeFormat return dateFormater }() private static let dayAndMonthFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = usedLocale dateFormater.dateFormat = dayAndMonthDateTimeFormat return dateFormater }() private static let dayMonthYearFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = usedLocale dateFormater.dateFormat = dayMonthYearDateTimeFormat return dateFormater }() @@ -73,26 +68,32 @@ open class BaseDateFormatter { } public static func backendDate(fromStrDate strDate: String) -> Date? { + apiFormatter.locale = usedLocale return apiFormatter.date(from: strDate) } public static func backendStrDate(withDate date: Date) -> String { + apiFormatter.locale = usedLocale return apiFormatter.string(from: date) } public static func backendDateWithoutTime(withDate date: Date) -> String { + apiDateWithoutTimeFormatter.locale = usedLocale return apiDateWithoutTimeFormatter.string(from: date) } public static func hourAndMinuteStrDate(withDate date: Date) -> String { + hourAndMinuteFormatter.locale = usedLocale return hourAndMinuteFormatter.string(from: date) } public static func dayAndMonthStrDate(withDate date: Date) -> String { + hourAndMinuteFormatter.locale = usedLocale return dayAndMonthFormatter.string(from: date) } public static func dayMonthYearStrDate(withDate date: Date) -> String { + hourAndMinuteFormatter.locale = usedLocale return dayMonthYearFormatter.string(from: date) } @@ -113,5 +114,5 @@ open class BaseDateFormatter { } }) } - + }