|
@@ -11,7 +11,6 @@
|
|
|
|
|
|
import 'dart:async';
|
|
import 'dart:async';
|
|
|
|
|
|
-import 'package:flutter/foundation.dart';
|
|
|
|
import 'package:intl/intl.dart';
|
|
import 'package:intl/intl.dart';
|
|
import 'package:intl/message_lookup_by_library.dart';
|
|
import 'package:intl/message_lookup_by_library.dart';
|
|
import 'package:intl/src/intl_helpers.dart';
|
|
import 'package:intl/src/intl_helpers.dart';
|
|
@@ -41,28 +40,28 @@ import 'messages_zh-TW.dart' as messages_zh_tw;
|
|
|
|
|
|
typedef Future<dynamic> LibraryLoader();
|
|
typedef Future<dynamic> LibraryLoader();
|
|
Map<String, LibraryLoader> _deferredLibraries = {
|
|
Map<String, LibraryLoader> _deferredLibraries = {
|
|
- 'bn_BN': () => new SynchronousFuture(null),
|
|
|
|
- 'ca': () => new SynchronousFuture(null),
|
|
|
|
- 'cs_CZ': () => new SynchronousFuture(null),
|
|
|
|
- 'de_DE': () => new SynchronousFuture(null),
|
|
|
|
- 'en': () => new SynchronousFuture(null),
|
|
|
|
- 'es_VE': () => new SynchronousFuture(null),
|
|
|
|
- 'fr_CA': () => new SynchronousFuture(null),
|
|
|
|
- 'fr_FR': () => new SynchronousFuture(null),
|
|
|
|
- 'hi_IN': () => new SynchronousFuture(null),
|
|
|
|
- 'hu_HU': () => new SynchronousFuture(null),
|
|
|
|
- 'id_ID': () => new SynchronousFuture(null),
|
|
|
|
- 'it_IT': () => new SynchronousFuture(null),
|
|
|
|
- 'ja_JP': () => new SynchronousFuture(null),
|
|
|
|
- 'ml_IN': () => new SynchronousFuture(null),
|
|
|
|
- 'nl_NL': () => new SynchronousFuture(null),
|
|
|
|
- 'pl_PL': () => new SynchronousFuture(null),
|
|
|
|
- 'pt_BR': () => new SynchronousFuture(null),
|
|
|
|
- 'pt_PT': () => new SynchronousFuture(null),
|
|
|
|
- 'ru_RU': () => new SynchronousFuture(null),
|
|
|
|
- 'tr_TR': () => new SynchronousFuture(null),
|
|
|
|
- 'zh_CN': () => new SynchronousFuture(null),
|
|
|
|
- 'zh_TW': () => new SynchronousFuture(null),
|
|
|
|
|
|
+ 'bn_BN': () => new Future.value(null),
|
|
|
|
+ 'ca': () => new Future.value(null),
|
|
|
|
+ 'cs_CZ': () => new Future.value(null),
|
|
|
|
+ 'de_DE': () => new Future.value(null),
|
|
|
|
+ 'en': () => new Future.value(null),
|
|
|
|
+ 'es_VE': () => new Future.value(null),
|
|
|
|
+ 'fr_CA': () => new Future.value(null),
|
|
|
|
+ 'fr_FR': () => new Future.value(null),
|
|
|
|
+ 'hi_IN': () => new Future.value(null),
|
|
|
|
+ 'hu_HU': () => new Future.value(null),
|
|
|
|
+ 'id_ID': () => new Future.value(null),
|
|
|
|
+ 'it_IT': () => new Future.value(null),
|
|
|
|
+ 'ja_JP': () => new Future.value(null),
|
|
|
|
+ 'ml_IN': () => new Future.value(null),
|
|
|
|
+ 'nl_NL': () => new Future.value(null),
|
|
|
|
+ 'pl_PL': () => new Future.value(null),
|
|
|
|
+ 'pt_BR': () => new Future.value(null),
|
|
|
|
+ 'pt_PT': () => new Future.value(null),
|
|
|
|
+ 'ru_RU': () => new Future.value(null),
|
|
|
|
+ 'tr_TR': () => new Future.value(null),
|
|
|
|
+ 'zh_CN': () => new Future.value(null),
|
|
|
|
+ 'zh_TW': () => new Future.value(null),
|
|
};
|
|
};
|
|
|
|
|
|
MessageLookupByLibrary? _findExact(String localeName) {
|
|
MessageLookupByLibrary? _findExact(String localeName) {
|
|
@@ -117,18 +116,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
|
|
}
|
|
}
|
|
|
|
|
|
/// User programs should call this before using [localeName] for messages.
|
|
/// User programs should call this before using [localeName] for messages.
|
|
-Future<bool> initializeMessages(String localeName) {
|
|
|
|
|
|
+Future<bool> initializeMessages(String localeName) async {
|
|
var availableLocale = Intl.verifiedLocale(
|
|
var availableLocale = Intl.verifiedLocale(
|
|
localeName, (locale) => _deferredLibraries[locale] != null,
|
|
localeName, (locale) => _deferredLibraries[locale] != null,
|
|
onFailure: (_) => null);
|
|
onFailure: (_) => null);
|
|
if (availableLocale == null) {
|
|
if (availableLocale == null) {
|
|
- return new SynchronousFuture(false);
|
|
|
|
|
|
+ return new Future.value(false);
|
|
}
|
|
}
|
|
var lib = _deferredLibraries[availableLocale];
|
|
var lib = _deferredLibraries[availableLocale];
|
|
- lib == null ? new SynchronousFuture(false) : lib();
|
|
|
|
|
|
+ await (lib == null ? new Future.value(false) : lib());
|
|
initializeInternalMessageLookup(() => new CompositeMessageLookup());
|
|
initializeInternalMessageLookup(() => new CompositeMessageLookup());
|
|
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
|
|
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
|
|
- return new SynchronousFuture(true);
|
|
|
|
|
|
+ return new Future.value(true);
|
|
}
|
|
}
|
|
|
|
|
|
bool _messagesExistFor(String locale) {
|
|
bool _messagesExistFor(String locale) {
|