From ed1edcc5b1452bff0f3a7d691ca442a90907a004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Kosmaty?= Date: Wed, 13 May 2020 12:19:16 +0200 Subject: [PATCH] [expo-localization][ios] Fix `locale` export (#8193) * [expo-localization][ios] Fix locale export * [danger][bot] Add missing changelog (#8195) --- packages/expo-localization/CHANGELOG.md | 2 ++ packages/expo-localization/ios/EXLocalization/EXLocalization.m | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/expo-localization/CHANGELOG.md b/packages/expo-localization/CHANGELOG.md index 6a294c6841ff4..40f8edc40093b 100644 --- a/packages/expo-localization/CHANGELOG.md +++ b/packages/expo-localization/CHANGELOG.md @@ -7,3 +7,5 @@ ### 🎉 New features ### 🐛 Bug fixes + +- Fixed `Localization.locale` throwing an exception on the iOS simulator. ([#8193](https://github.com/expo/expo/pull/8193) by [@lukmccall](https://github.com/lukmccall)) diff --git a/packages/expo-localization/ios/EXLocalization/EXLocalization.m b/packages/expo-localization/ios/EXLocalization/EXLocalization.m index d6a29fc74edb6..36a6c967c5195 100644 --- a/packages/expo-localization/ios/EXLocalization/EXLocalization.m +++ b/packages/expo-localization/ios/EXLocalization/EXLocalization.m @@ -21,7 +21,7 @@ @implementation EXLocalization - (NSDictionary *)constantsToExport { NSArray *preferredLocales = [NSLocale preferredLanguages]; - if (preferredLocales == nil) { + if (![preferredLocales count]) { NSString *currentLocale = [[NSLocale currentLocale] localeIdentifier]; if (currentLocale == nil) { currentLocale = @"en_US";