diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index 53cb57b..8103bbd 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKitAdditions" - s.version = "0.0.12" + s.version = "0.0.13" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/NikAshanin/LeadKitAdditions" s.license = "Apache License, Version 2.0" diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift index 183223e..0748a37 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) }