Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit b0896b1

Browse files
committed
Fix bug
1 parent 43507e1 commit b0896b1

File tree

1 file changed

+33
-12
lines changed

1 file changed

+33
-12
lines changed

lib/date_symbol_data_http_request.dart

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,41 @@ export 'src/data/dates/locale_list.dart';
2020
/// The [url] parameter should end with a "/". For example,
2121
/// "http://localhost:8000/dates/"
2222
Future<void> initializeDateFormatting(String locale, String url) {
23-
var reader = HttpRequestDataReader('${url}symbols/');
24-
initializeDateSymbols(() => LazyLocaleData(
25-
reader, _createDateSymbol, availableLocalesForDateFormatting));
26-
var reader2 = HttpRequestDataReader('${url}patterns/');
27-
initializeDatePatterns(() =>
28-
LazyLocaleData(reader2, (x) => x, availableLocalesForDateFormatting));
29-
var actualLocale =
30-
Intl.verifiedLocale(locale, availableLocalesForDateFormatting.contains);
31-
return initializeIndividualLocaleDateFormatting((symbols, patterns) {
32-
return Future.wait(<Future<List<dynamic>>>[
23+
//Initialize symbols
24+
var symbolReader = HttpRequestDataReader('${url}symbols/');
25+
LazyLocaleData symbolsInitializer() => LazyLocaleData(
26+
symbolReader,
27+
_createDateSymbol,
28+
availableLocalesForDateFormatting,
29+
);
30+
initializeDateSymbols(symbolsInitializer);
31+
32+
//Initialize patterns
33+
var patternsReader = HttpRequestDataReader('${url}patterns/');
34+
LazyLocaleData patternsInitializer() => LazyLocaleData(
35+
patternsReader,
36+
(x) => x,
37+
availableLocalesForDateFormatting,
38+
);
39+
initializeDatePatterns(patternsInitializer);
40+
41+
var actualLocale = Intl.verifiedLocale(
42+
locale,
43+
availableLocalesForDateFormatting.contains,
44+
)!;
45+
46+
//Init locale for both symbols and patterns
47+
Future<List<void>> initLocale(
48+
LazyLocaleData symbols,
49+
LazyLocaleData patterns,
50+
) {
51+
return Future.wait([
3352
symbols.initLocale(actualLocale),
34-
patterns.initLocale(actualLocale)
53+
patterns.initLocale(actualLocale),
3554
]);
36-
});
55+
}
56+
57+
return initializeIndividualLocaleDateFormatting(initLocale);
3758
}
3859

3960
/// Defines how new date symbol entries are created.

0 commit comments

Comments
 (0)