[localization] Fix exporting region constant (#5740)

# Why Resolve #5735. # How Wrapped `region` variable into UMNullIfNil macro, because `[[NSLocale currentLocale] objectForKey:NSLocaleCountryCode]` could return nil on iOS simulator.
expo · Oct 15, 2019 · d3584d7 · d3584d7
1 parent bcc947e
commit d3584d7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/expo-localization/ios/EXLocalization/EXLocalization.m b/packages/expo-localization/ios/EXLocalization/EXLocalization.m
@@ -21,6 +21,14 @@ @implementation EXLocalization
 - (NSDictionary *)constantsToExport
 {
   NSArray<NSString *> *preferredLocales = [NSLocale preferredLanguages];
+  if (preferredLocales == nil) {
+    NSString *currentLocale = [[NSLocale currentLocale] localeIdentifier];
+    if (currentLocale == nil) {
+      currentLocale = @"en_US";
+    }
+    preferredLocales = @[currentLocale];
+  }
+
   NSTimeZone *currentTimeZone = [NSTimeZone localTimeZone];
   NSString *region = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode];
 
@@ -30,7 +38,7 @@ - (NSDictionary *)constantsToExport
            @"locales": preferredLocales,
            @"timezone": [currentTimeZone name],
            @"isoCurrencyCodes": [NSLocale ISOCurrencyCodes],
-           @"region": region
+           @"region": UMNullIfNil(region)
            };
 }