Allow locale to be injected in TRSettingsController

liushaoxing321 · Apr 18, 2016 · befadb5 · befadb5
1 parent 9009566
commit befadb5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Tropos/Controllers/TRSettingsController.h b/Tropos/Controllers/TRSettingsController.h
@@ -12,6 +12,8 @@ typedef NS_ENUM(NSInteger, TRUnitSystem) {
 
 @property (nonatomic, readonly) RACSignal *unitSystemChanged;
 
+- (instancetype)initWithLocale:(NSLocale *)locale NS_DESIGNATED_INITIALIZER;
+
 - (void)registerSettings;
 
 - (TRUnitSystem)unitSystem;

diff --git a/Tropos/Controllers/TRSettingsController.m b/Tropos/Controllers/TRSettingsController.m
@@ -7,6 +7,7 @@
 
 @interface TRSettingsController ()
 
+@property (nonatomic) NSLocale *locale;
 @property (nonatomic) RACSignal *userDefaultsChanged;
 
 @end
@@ -15,16 +16,22 @@ @implementation TRSettingsController
 
 #pragma mark - Initializers
 
-- (instancetype)init
+- (instancetype)initWithLocale:(NSLocale *)locale
 {
     self = [super init];
     if (!self) return nil;
 
+    self.locale = locale;
     self.userDefaultsChanged = [[NSNotificationCenter defaultCenter] rac_addObserverForName:NSUserDefaultsDidChangeNotification object:nil];
 
     return self;
 }
 
+- (instancetype)init
+{
+    return [self initWithLocale:[NSLocale autoupdatingCurrentLocale]];
+}
+
 #pragma mark - Properties
 
 - (RACSignal *)unitSystemChanged
@@ -60,7 +67,7 @@ - (void)setUnitSystem:(TRUnitSystem)unitSystem
 
 - (void)registerUnitSystem
 {
-    BOOL localeUsesMetric = [[[NSLocale currentLocale] objectForKey:NSLocaleUsesMetricSystem] boolValue];
+    BOOL localeUsesMetric = [[self.locale objectForKey:NSLocaleUsesMetricSystem] boolValue];
     TRUnitSystem unitSystem = localeUsesMetric? TRUnitSystemMetric : TRUnitSystemImperial;
     [[NSUserDefaults standardUserDefaults] registerDefaults:@{TRSettingsUnitSystemKey: @(unitSystem)}];
 }