From c8be5b1001ac763b46dbe7a74e92716a983e14e4 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Sat, 24 Oct 2020 14:55:16 -0500 Subject: [PATCH] Finer granularity! --- Clocker/Panel/Data Layer/TimezoneDataOperations.swift | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift index aa3fe05..e16031f 100644 --- a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift +++ b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift @@ -56,11 +56,14 @@ extension TimezoneDataOperations { return nil } + if numberOfDays == 0 { + let hoursLeft = nextDaylightSavingsTransition.hours(from: newDate) + let suffix = hoursLeft == 1 ? "hour" : "hours" + return "Heads up! DST transition will occur in \(hoursLeft) \(suffix)." + } + let suffix = numberOfDays == 1 ? "day" : "days" - return numberOfDays == 0 ? - NSLocalizedString("Daylights Saving transition will occur in < 24 hours", - comment: "Daylights Saving transition will occur in < 24 hours") : - "Daylight Savings transition will occur in \(numberOfDays) \(suffix)!" + return "Heads up! DST transition will occur in \(numberOfDays) \(suffix)." } private func checkForUpcomingEvents() -> (String, String)? {