Merge pull request #3 from shajz/fix.missing.country.iOS-17.4

shajz · Mar 25, 2024 · 4257e8b · 4257e8b
2 parents e001568 + 3dc4ca5
commit 4257e8b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/ios/GoogleMaps/PluginGeocoder.m b/src/ios/GoogleMaps/PluginGeocoder.m
@@ -29,7 +29,16 @@ - (void)pluginInitialize
   {
       NSString *identifier = [NSLocale localeIdentifierFromComponents: [NSDictionary dictionaryWithObject: countryCode forKey: NSLocaleCountryCode]];
       NSString *country = [[[NSLocale alloc] initWithLocaleIdentifier:currentLanguage] displayNameForKey: NSLocaleIdentifier value: identifier];
-      [countries addObject: country];
+      if (country != nil) {
+          [countries addObject: country];
+      } else {
+          NSString *countryFallback = [[[NSLocale alloc] initWithLocaleIdentifier:@"en-US"] displayNameForKey: NSLocaleIdentifier value: identifier];
+          if (countryFallback != nil) {
+              [countries addObject: countryFallback];
+          } else {
+              [countries addObject: countryCode];
+          }
+      }
   }
 
   self.codeForCountryDictionary = [[NSDictionary alloc] initWithObjects:countryCodes forKeys:countries];