Merge branch 'charlesmchen/crashManualCircumvention'

charlesmchen · charlesmchen · commit b7307ecfa05c · 2017-06-22T15:10:24.000-04:00
diff --git a/Signal/src/ViewControllers/OWSCountryMetadata.m b/Signal/src/ViewControllers/OWSCountryMetadata.m
@@ -24,7 +24,7 @@ + (OWSCountryMetadata *)countryMetadataWithName:(NSString *)name
     instance.googleDomain = googleDomain;
     instance.countryCode = countryCode;
 
-    NSString *localizedCountryName = [[NSLocale currentLocale] localizedStringForCountryCode:countryCode];
+    NSString *localizedCountryName = [[NSLocale currentLocale] displayNameForKey:NSLocaleCountryCode value:countryCode];
     if (localizedCountryName.length < 1) {
         localizedCountryName = name;
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ + (OWSCountryMetadata )countryMetadataWithName:(NSString )name`
`24`	`24`	`instance.googleDomain = googleDomain;`
`25`	`25`	`instance.countryCode = countryCode;`
`26`	`26`
`27`		`- NSString *localizedCountryName = [[NSLocale currentLocale] localizedStringForCountryCode:countryCode];`
	`27`	`+ NSString *localizedCountryName = [[NSLocale currentLocale] displayNameForKey:NSLocaleCountryCode value:countryCode];`
`28`	`28`	`if (localizedCountryName.length < 1) {`
`29`	`29`	`localizedCountryName = name;`
`30`	`30`	`}`