From c7b2d48bc4fcd2f45cb53aa41ab6d44aa4cd4785 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 18:10:10 +0300 Subject: [PATCH] DateFormatter locale parameter added --- .../Classes/BaseDateFormatter.swift | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift index a72cbbc..87080fc 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift @@ -33,40 +33,44 @@ open class BaseDateFormatter { private static let apiFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = Locale.current + dateFormatter.locale = usedLocale dateFormatter.dateFormat = BaseDateFormatter.apiDateTimeFormat return dateFormatter }() private static let apiDateWithoutTimeFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = Locale.current + dateFormatter.locale = usedLocale dateFormatter.dateFormat = BaseDateFormatter.apiDateWithoutTimeFormat return dateFormatter }() private static let hourAndMinuteFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.hourAndMinuteDateTimeFormat return dateFormater }() private static let dayAndMonthFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.dayAndMonthDateTimeFormat return dateFormater }() private static let dayMonthYearFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.dayMonthYearDateTimeFormat return dateFormater }() - // MARK: Internal functions + // MARK: Public interface + + open class var usedLocale: Locale { + return .current + } public static func backendDate(fromStrDate strDate: String) -> Date? { return BaseDateFormatter.apiFormatter.date(from: strDate)