From 7ab3d1945b1b8a10d06d9c4903e67cbbdad5c435 Mon Sep 17 00:00:00 2001 From: Victor Kachalov Date: Wed, 18 Nov 2020 09:41:16 +0100 Subject: [PATCH] 2.0.1 preps --- CHANGELOG.md | 4 ++++ README.md | 2 +- bin/main.dart | 3 +-- example/assets/i18n/ru.json | 2 +- {bin => lib}/constants.dart | 0 lib/localized.dart | 8 +++----- pubspec.lock | 5 ----- pubspec.yaml | 4 +--- 8 files changed, 11 insertions(+), 17 deletions(-) rename {bin => lib}/constants.dart (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20cea5d..427bc31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [2.0.1] - 18.11.2020 + +* Minor fixes + ## [2.0.0] - 16.11.2020 * New feature: Translation. Support of Yandex, Google and Microsoft Translator APIs diff --git a/README.md b/README.md index d9d830e..57118c0 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ String extensions for localization and a translation utility - Add this to your package's pubspec.yaml file: ``` Dart dependencies: - localized: ^2.0.0 + localized: ^2.0.1 ``` - Get dependencies diff --git a/bin/main.dart b/bin/main.dart index 064f26c..ce4139c 100644 --- a/bin/main.dart +++ b/bin/main.dart @@ -3,11 +3,10 @@ import 'dart:io'; import 'package:args/args.dart' show ArgParser; import 'package:http/http.dart' as http; +import 'package:localized/constants.dart'; import 'package:translator/translator.dart'; import 'package:tuple/tuple.dart'; -import 'constants.dart'; - /// Supported translation providers /// GoogleTest should be on the first place /// diff --git a/example/assets/i18n/ru.json b/example/assets/i18n/ru.json index 0d99f59..fe523fc 100644 --- a/example/assets/i18n/ru.json +++ b/example/assets/i18n/ru.json @@ -1 +1 @@ -{"title":"Домашняя страница","amount_of_clicks":"Раз вы нажали кнопку:","increase":"Увеличить"} \ No newline at end of file +{"title":"Главная страница","amount_of_clicks":"Времена, когда вы нажали на кнопку:","increase":"Увеличить"} \ No newline at end of file diff --git a/bin/constants.dart b/lib/constants.dart similarity index 100% rename from bin/constants.dart rename to lib/constants.dart diff --git a/lib/localized.dart b/lib/localized.dart index 0a0cb51..a218e66 100644 --- a/lib/localized.dart +++ b/lib/localized.dart @@ -1,11 +1,11 @@ library localized; import 'dart:convert'; -import 'dart:io' show Platform; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; + +import 'constants.dart'; /// A [Localized] extension for [String] /// @@ -76,9 +76,7 @@ class _LocalizationServiceDelegate @override bool isSupported(Locale locale) => locales == null - ? (Platform.isIOS - ? kCupertinoSupportedLanguages.contains(locale.languageCode) - : kMaterialSupportedLanguages.contains(locale.languageCode)) + ? kSupportedLanguages.contains(locale.languageCode) : locales.map((e) => e.languageCode).contains(locale.languageCode); @override diff --git a/pubspec.lock b/pubspec.lock index 191b160..34baff2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -76,11 +76,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" flutter_test: dependency: "direct dev" description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 2a500a7..97262e1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: localized description: String extensions for different localizations and a translation utility without additional efforts. -version: 2.0.0 +version: 2.0.1 homepage: https://github.com/VictorKachalov/localized environment: @@ -10,8 +10,6 @@ environment: dependencies: flutter: sdk: flutter - flutter_localizations: - sdk: flutter path_provider: ^1.6.21 args: ^1.6.0 tuple: ^1.0.3