Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Use a [NSLocale currentLocale] for first locale on iOS to ensure countryCode exists. Allow language-only locales. #6995

Merged
GaryQian merged 4 commits into from
Nov 28, 2018
Merged

Use a [NSLocale currentLocale] for first locale on iOS to ensure countryCode exists. Allow language-only locales. #6995

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db2b2be
Use NSLocale::currentLocale for first/default locale to avoid iOS str…
GaryQian Nov 28, 2018
789f8ee
Add explanation of why use a different API for first locale
GaryQian Nov 28, 2018
2e58639
Change currentLocale to prepend to preferredLocales list
GaryQian Nov 28, 2018
81eaa79
Autorelease the allocations
GaryQian Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,17 +749,34 @@ - (void)onMemoryWarning:(NSNotification*)notification {
- (void)onLocaleUpdated:(NSNotification*)notification {
NSArray<NSString*>* preferredLocales = [NSLocale preferredLanguages];
NSMutableArray<NSString*>* data = [NSMutableArray new];
Copy link
Contributor

@dnfield dnfield Nov 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So long as you're here, this should be NSMutableArray<NSString*>* data = [[NSMutableArray new] autorelease];. I have another PR that fixes it, but might as well get it now.


// Force prepend the [NSLocale currentLocale] to the front of the list
// to ensure we are including the full default locale. preferredLocales
// is not guaranteed to include anything beyond the languageCode.
NSLocale* currentLocale = [NSLocale currentLocale];
NSString* languageCode = [currentLocale objectForKey:NSLocaleLanguageCode];
NSString* countryCode = [currentLocale objectForKey:NSLocaleCountryCode];
NSString* scriptCode = [currentLocale objectForKey:NSLocaleScriptCode];
NSString* variantCode = [currentLocale objectForKey:NSLocaleVariantCode];
if (languageCode) {
[data addObject:languageCode];
[data addObject:(countryCode ? countryCode : @"")];
[data addObject:(scriptCode ? scriptCode : @"")];
[data addObject:(variantCode ? variantCode : @"")];
}

// Add any secondary locales/languages to the list.
for (NSString* localeID in preferredLocales) {
NSLocale* currentLocale = [[NSLocale alloc] initWithLocaleIdentifier:localeID];
Copy link
Member

@cbracken cbracken Nov 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

NSLocale* currentLocale = [[[NSLocale alloc] initWithLocaleIdentifier:localeID] autorelease];

Copy link
Member

@cbracken cbracken Nov 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(or call [currentLocale release] right before the continue)

NSString* languageCode = [currentLocale objectForKey:NSLocaleLanguageCode];
NSString* countryCode = [currentLocale objectForKey:NSLocaleCountryCode];
NSString* scriptCode = [currentLocale objectForKey:NSLocaleScriptCode];
NSString* variantCode = [currentLocale objectForKey:NSLocaleVariantCode];
if (!languageCode || !countryCode) {
if (!languageCode) {
continue;
}
[data addObject:languageCode];
[data addObject:countryCode];
[data addObject:(countryCode ? countryCode : @"")];
[data addObject:(scriptCode ? scriptCode : @"")];
[data addObject:(variantCode ? variantCode : @"")];
}
Expand Down