diff --git a/lib/src/country_code.dart b/lib/src/country_code.dart index 3a8069f..cf10c9a 100644 --- a/lib/src/country_code.dart +++ b/lib/src/country_code.dart @@ -1,4 +1,5 @@ import 'package:collection/collection.dart' show IterableExtension; +import 'package:diacritic/diacritic.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart' show kDebugMode; @@ -66,13 +67,14 @@ class CountryCode { } CountryCode localize(BuildContext context) { + final nam = CountryLocalizations.of(context)?.translate(code) ?? name; return this - ..name = CountryLocalizations.of(context)?.translate(code) ?? name; + ..name = nam == null? name : removeDiacritics(nam); } factory CountryCode.fromJson(Map json) { return CountryCode( - name: json['name'], + name: removeDiacritics(json['name']), code: json['code'], dialCode: json['dial_code'], flagUri: 'flags/${json['code'].toLowerCase()}.png', diff --git a/lib/src/country_localizations.dart b/lib/src/country_localizations.dart index b079091..ec24d2e 100644 --- a/lib/src/country_localizations.dart +++ b/lib/src/country_localizations.dart @@ -119,7 +119,7 @@ class _CountryLocalizationsDelegate @override Future load(Locale locale) async { - CountryLocalizations localizations = CountryLocalizations(locale); + CountryLocalizations localizations = CountryLocalizations(const Locale('en'));//locale); await localizations.load(); return localizations; } diff --git a/pubspec.yaml b/pubspec.yaml index ccfb776..c7fc8d8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: flutter: sdk: flutter collection: ^1.15.0 + diacritic: ^0.1.5 flutter: assets: