Update labeling of market periods

horizontalsystems · May 28, 2024 · 6510487 · 6510487
1 parent 35bf15c
commit 6510487
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/Etf/MarketEtfViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/Etf/MarketEtfViewModel.swift
@@ -109,14 +109,14 @@ extension MarketEtfViewModel {
 
         var title: String {
             switch self {
-            case let .period(timePeriod): return timePeriod.title
+            case let .period(timePeriod): return "market.time_period.\(timePeriod.rawValue)".localized
             case .all: return "market.etf.period.all".localized
             }
         }
 
         var shortTitle: String {
             switch self {
-            case let .period(timePeriod): return timePeriod.shortTitle
+            case let .period(timePeriod): return "market.time_period.\(timePeriod.rawValue).short".localized
             case .all: return "market.etf.period.all".localized
             }
         }

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Market/MarketModule.swift
@@ -293,12 +293,12 @@ extension MarketModule {
 
         var title: String {
             switch self {
-            case .day: return "market.advanced_search.day".localized
-            case .week: return "market.advanced_search.week".localized
-            case .week2: return "market.advanced_search.week2".localized
-            case .month: return "market.advanced_search.month".localized
-            case .month6: return "market.advanced_search.month6".localized
-            case .year: return "market.advanced_search.year".localized
+            case .day: return "market.time_period.24h".localized
+            case .week: return "market.time_period.1w".localized
+            case .week2: return "market.time_period.2w".localized
+            case .month: return "market.time_period.1m".localized
+            case .month6: return "market.time_period.6m".localized
+            case .year: return "market.time_period.1y".localized
             }
         }
 
@@ -533,21 +533,33 @@ extension MarketModule { // ViewModel Items
 
 extension HsTimePeriod {
     var title: String {
-        "market.time_period.\(rawValue)".localized
+        switch self {
+        case .day1: return "market.time_period.24h".localized
+        default: return "market.time_period.\(rawValue)".localized
+        }
     }
 
     var shortTitle: String {
-        "market.time_period.\(rawValue).short".localized
+        switch self {
+        case .day1: return "market.time_period.24h.short".localized
+        default: return "market.time_period.\(rawValue).short".localized
+        }
     }
 }
 
 extension WatchlistTimePeriod {
     var title: String {
-        "market.time_period.\(rawValue)".localized
+        switch self {
+        case .day1: return "market.time_period.24h".localized
+        default: return "market.time_period.\(rawValue)".localized
+        }
     }
 
     var shortTitle: String {
-        "market.time_period.\(rawValue).short".localized
+        switch self {
+        case .day1: return "market.time_period.24h.short".localized
+        default: return "market.time_period.\(rawValue).short".localized
+        }
     }
 }
 

diff --git a/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings b/UnstoppableWallet/UnstoppableWallet/en.lproj/Localizable.strings
@@ -724,6 +724,7 @@
 "market.top_coins" = "Top %@";
 
 "market.time_period.title" = "Period";
+"market.time_period.24h" = "24 Hours";
 "market.time_period.1d" = "1 Day";
 "market.time_period.1w" = "1 Week";
 "market.time_period.2w" = "2 Weeks";
@@ -733,7 +734,8 @@
 "market.time_period.1y" = "1 Year";
 "market.time_period.2y" = "2 Years";
 "market.time_period.5y" = "5 Years";
-"market.time_period.1d.short" = "24H";
+"market.time_period.24h.short" = "24H";
+"market.time_period.1d.short" = "1D";
 "market.time_period.1w.short" = "1W";
 "market.time_period.2w.short" = "2W";
 "market.time_period.1m.short" = "1M";