Remove duplicate code, revert enum to string

Author: mindgraffiti

WooCommerce/Classes/Model/Order+Woo.swift

@@ -18,34 +18,33 @@ extension Order {
     /// Translates a Section Identifier into a Human-Readable String.
     ///
     static func descriptionForSectionIdentifier(_ identifier: String) -> String {
-        guard let section = Sections(rawValue: identifier) else {
+        guard let age = Age(rawValue: identifier) else {
             return String()
         }
 
-        return section.description
+        return age.description
     }
+}
 
-    // MARK: - Private Helpers
-    fileprivate enum Sections: String {
-        case Months     = "0"
-        case Weeks      = "2"
-        case Days       = "4"
-        case Yesterday  = "5"
-        case Today      = "6"
-
-        var description: String {
-            switch self {
-            case .Months:
-                return NSLocalizedString("Older than a Month", comment: "Notifications Months Section Header")
-            case .Weeks:
-                return NSLocalizedString("Older than a Week", comment: "Notifications Weeks Section Header")
-            case .Days:
-                return NSLocalizedString("Older than 2 days", comment: "Notifications +2 Days Section Header")
-            case .Yesterday:
-                return NSLocalizedString("Yesterday", comment: "Notifications Yesterday Section Header")
-            case .Today:
-                return NSLocalizedString("Today", comment: "Notifications Today Section Header")
-            }
+enum Age: String {
+    case months     = "0"
+    case weeks      = "2"
+    case days       = "4"
+    case yesterday  = "5"
+    case today      = "6"
+
+    var description: String {
+        switch self {
+        case .months:
+            return NSLocalizedString("Older than a Month", comment: "Notifications Months Section Header")
+        case .weeks:
+            return NSLocalizedString("Older than a Week", comment: "Notifications Weeks Section Header")
+        case .days:
+            return NSLocalizedString("Older than 2 days", comment: "Notifications +2 Days Section Header")
+        case .yesterday:
+            return NSLocalizedString("Yesterday", comment: "Notifications Yesterday Section Header")
+        case .today:
+            return NSLocalizedString("Today", comment: "Notifications Today Section Header")
         }
     }
 }

WooCommerce/Classes/Model/StorageOrder+Woo.swift

@@ -6,10 +6,10 @@ extension StorageOrder {
     /// Returns a Section Identifier that can be sorted. Note that this string is not human readable, and
     /// you should use the *descriptionForSectionIdentifier* method as well!.
     ///
-    @objc func normalizedAgeAsString() -> Int {
+    @objc func normalizedAgeAsString() -> String {
         // Normalize Dates: Time must not be considered. Just the raw dates
         guard let fromDate = dateCreated?.normalizedDate() else {
-            return 0
+            return ""
         }
 
         let toDate = Date().normalizedDate()
@@ -37,28 +37,4 @@ extension StorageOrder {
 
         return identifier.rawValue
     }
-
-    // MARK: - Private Helpers
-    private enum Age: Int, CustomStringConvertible {
-        case months     = 0
-        case weeks      = 2
-        case days       = 4
-        case yesterday  = 5
-        case today      = 6
-
-        var description: String {
-            switch self {
-            case .months:
-                return NSLocalizedString("Older than a Month", comment: "Notifications Months Section Header")
-            case .weeks:
-                return NSLocalizedString("Older than a Week", comment: "Notifications Weeks Section Header")
-            case .days:
-                return NSLocalizedString("Older than 2 days", comment: "Notifications +2 Days Section Header")
-            case .yesterday:
-                return NSLocalizedString("Yesterday", comment: "Notifications Yesterday Section Header")
-            case .today:
-                return NSLocalizedString("Today", comment: "Notifications Today Section Header")
-            }
-        }
-    }
 }