Re-reverse logic of ignorePluralRules

ignorePluralRules=true, "old" beahvior (default) ignorePluralRules=false, "new" beahvior
aissat · May 7, 2024 · 33c7c56 · 33c7c56
1 parent 33b06e5
commit 33c7c56
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -23,7 +23,7 @@ void main() async {
     // startLocale: Locale('de', 'DE'),
     // saveLocale: false,
     // useOnlyLangCode: true,
-    // ignorePluralRules: true,
+    // ignorePluralRules: false,
 
     // optional assetLoader default used is RootBundleAssetLoader which uses flutter's assetloader
     // install easy_localization_loader for enable custom loaders

diff --git a/lib/src/easy_localization_app.dart b/lib/src/easy_localization_app.dart
@@ -73,13 +73,13 @@ class EasyLocalization extends StatefulWidget {
   /// // "nTimes": "{count, plural, =0{never} =1{once} other{{count} times}}"
   /// // Text(AppLocalizations.of(context)!.nTimes(_counter)),
   /// // will print "never, once, 2 times" for ALL languages.
-  /// ignorePluralRules: false
+  /// ignorePluralRules: true
   /// // Use "zero" rule for 0 only if the language is set to do so (e.g. for
   /// "lt" but not for "en").
   /// // "nTimes": "{count, plural, =0{never} =1{once} other{{count} times}}"
   /// // Text(AppLocalizations.of(context)!.nTimes(_counter)),
   /// // will print "never, once, 2 times" ONLY for languages with plural rules.
-  /// ignorePluralRules: true
+  /// ignorePluralRules: false
   /// ```
   final bool ignorePluralRules;
 
@@ -137,7 +137,7 @@ class EasyLocalization extends StatefulWidget {
     this.useOnlyLangCode = false,
     this.useFallbackTranslations = false,
     this.useFallbackTranslationsForEmptyResources = false,
-    this.ignorePluralRules = false,
+    this.ignorePluralRules = true,
     this.assetLoader = const RootBundleAssetLoader(),
     this.extraAssetLoaders,
     this.saveLocale = true,
@@ -308,7 +308,7 @@ class _EasyLocalizationDelegate extends LocalizationsDelegate<Localization> {
 
   _EasyLocalizationDelegate({
     required this.useFallbackTranslationsForEmptyResources,
-    this.ignorePluralRules = false,
+    this.ignorePluralRules = true,
     this.localizationController,
     this.supportedLocales,
   }) {

diff --git a/lib/src/localization.dart b/lib/src/localization.dart
@@ -36,7 +36,7 @@ class Localization {
     Translations? translations,
     Translations? fallbackTranslations,
     bool useFallbackTranslationsForEmptyResources = false,
-    bool ignorePluralRules = false,
+    bool ignorePluralRules = true,
   }) {
     instance._locale = locale;
     instance._translations = translations;
@@ -119,7 +119,7 @@ class Localization {
   }
 
   static PluralRule? _pluralRule(String? locale, num howMany) {
-    if (!instance._ignorePluralRules) {
+    if (instance._ignorePluralRules) {
       return () => _pluralCaseFallback(howMany);
     }
     startRuleEvaluation(howMany);

diff --git a/test/easy_localization_language_specific_test.dart b/test/easy_localization_language_specific_test.dart
@@ -48,7 +48,7 @@ void main() {
       Localization.load(const Locale('en'),
           translations: r.translations,
           fallbackTranslations: r.fallbackTranslations,
-          ignorePluralRules: true);
+          ignorePluralRules: false);
       expect(Localization.instance.plural('hat', 2), 'other hats');
       expect(Localization.instance.plural('hat', 0), 'other hats');
       expect(Localization.instance.plural('hat', 3), 'other hats');
@@ -70,7 +70,7 @@ void main() {
       Localization.load(const Locale('ru'),
           translations: r.translations,
           fallbackTranslations: r.fallbackTranslations,
-          ignorePluralRules: true);
+          ignorePluralRules: false);
       expect(Localization.instance.plural('hat', 2), 'few hats');
       expect(Localization.instance.plural('hat', 3), 'few hats');
     });
@@ -85,7 +85,7 @@ void main() {
       Localization.load(const Locale('ru'),
           translations: r.translations,
           fallbackTranslations: r.fallbackTranslations,
-          ignorePluralRules: true);
+          ignorePluralRules: false);
       expect(Localization.instance.plural('hat', 0), 'many hats');
       expect(Localization.instance.plural('hat', 5), 'many hats');
     });

diff --git a/test/easy_localization_widget_test.dart b/test/easy_localization_widget_test.dart
@@ -285,7 +285,7 @@ void main() async {
         await tester.pumpWidget(EasyLocalization(
           path: '../../i18n',
           supportedLocales: const [Locale('en', 'US'), Locale('ar', 'DZ')],
-          ignorePluralRules: true,
+          ignorePluralRules: false,
           child: const MyApp(),
         ));