Skip to content

Commit 2db4f01

Browse files
committed
Adjust formatting operations for date ranges
1 parent 3c20b10 commit 2db4f01

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Networking/Networking/Extensions/DateFormatter+Woo.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public extension DateFormatter {
107107
/// Date formatter used for creating the properly-formatted date range info. Typically
108108
/// used when setting the end date on `AnalyticsHubTimeRangeGenerator`.
109109
///
110-
public static func createAnalyticsHubDayMonthYearFormatter(timezone: TimeZone) -> DateFormatter {
110+
public static func createDayMonthYearFormatter(timezone: TimeZone) -> DateFormatter {
111111
let formatter = DateFormatter()
112112
formatter.timeZone = timezone
113113
formatter.dateFormat = "MMM d, yyyy"
@@ -117,7 +117,7 @@ public extension DateFormatter {
117117
/// Date formatter used for creating the properly-formatted date range info. Typically
118118
/// used when setting the end date of a same-month range on `AnalyticsHubTimeRangeGenerator`.
119119
///
120-
public static func createAnalyticsHubDayYearFormatter(timezone: TimeZone) -> DateFormatter {
120+
public static func createDayYearFormatter(timezone: TimeZone) -> DateFormatter {
121121
let formatter = DateFormatter()
122122
formatter.timeZone = timezone
123123
formatter.dateFormat = "d, yyyy"
@@ -127,7 +127,7 @@ public extension DateFormatter {
127127
/// Date formatter used for creating the properly-formatted date range info. Typically
128128
/// used when setting the start date on `AnalyticsHubTimeRangeGenerator`.
129129
///
130-
public static func createAnalyticsHubDayMonthFormatter(timezone: TimeZone) -> DateFormatter {
130+
public static func createDayMonthFormatter(timezone: TimeZone) -> DateFormatter {
131131
let formatter = DateFormatter()
132132
formatter.timeZone = timezone
133133
formatter.dateFormat = "MMM d"

WooCommerce/Classes/Extensions/Date+Woo.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ extension Date {
7676
/// returns: Jan 1, 2022
7777
///
7878
func formatAsRange(with other: Date? = nil, timezone: TimeZone, calendar: Calendar) -> String {
79-
guard let other = other else {
80-
return DateFormatter.Stats.createAnalyticsHubDayMonthYearFormatter(timezone: timezone).string(from: self)
79+
guard let other else {
80+
return DateFormatter.Stats.createDayMonthYearFormatter(timezone: timezone).string(from: self)
8181
}
8282

8383
let formattedStart: String
8484
if self.isSameYear(as: other, using: calendar) {
85-
formattedStart = DateFormatter.Stats.createAnalyticsHubDayMonthFormatter(timezone: timezone).string(from: self)
85+
formattedStart = DateFormatter.Stats.createDayMonthFormatter(timezone: timezone).string(from: self)
8686
} else {
87-
formattedStart = DateFormatter.Stats.createAnalyticsHubDayMonthYearFormatter(timezone: timezone).string(from: self)
87+
formattedStart = DateFormatter.Stats.createDayMonthYearFormatter(timezone: timezone).string(from: self)
8888
}
8989

9090
let formattedEnd: String
9191
if self.isSameMonth(as: other, using: calendar) {
92-
formattedEnd = DateFormatter.Stats.createAnalyticsHubDayYearFormatter(timezone: timezone).string(from: other)
92+
formattedEnd = DateFormatter.Stats.createDayYearFormatter(timezone: timezone).string(from: other)
9393
} else {
94-
formattedEnd = DateFormatter.Stats.createAnalyticsHubDayMonthYearFormatter(timezone: timezone).string(from: other)
94+
formattedEnd = DateFormatter.Stats.createDayMonthYearFormatter(timezone: timezone).string(from: other)
9595
}
9696

9797
return "\(formattedStart) - \(formattedEnd)"

0 commit comments

Comments
 (0)