Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass scriptCode into Locale on initialization. #6711

Merged
merged 3 commits into from
Nov 7, 2018
Merged

Pass scriptCode into Locale on initialization. #6711

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e9c87
Create Locale with scriptCode.
GaryQian Oct 31, 2018
7fefd67
Check if script or country is ''
GaryQian Oct 31, 2018
d708c29
Minor rework
GaryQian Nov 2, 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
10 changes: 8 additions & 2 deletions lib/ui/hooks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ void _updateLocales(List<String> locales) {
final int numLocales = locales.length ~/ stringsPerLocale;
window._locales = new List<Locale>(numLocales);
for (int localeIndex = 0; localeIndex < numLocales; localeIndex++) {
window._locales[localeIndex] = new Locale(locales[localeIndex * stringsPerLocale],
locales[localeIndex * stringsPerLocale + 1]);
final String countryCode = locales[localeIndex * stringsPerLocale + 1];
final String scriptCode = locales[localeIndex * stringsPerLocale + 2];

window._locales[localeIndex] = new Locale.fromSubtags(
languageCode: locales[localeIndex * stringsPerLocale],
countryCode: countryCode.isEmpty ? null : countryCode,
scriptCode: scriptCode.isEmpty ? null : scriptCode,
);
}
_invoke(window.onLocaleChanged, window._onLocaleChangedZone);
}
Expand Down