Fixed plural rules fallback

wonderfulday-john · Jul 3, 2021 · 5a57f96 · 5a57f96
1 parent c51dd44
commit 5a57f96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/src/localization.dart b/lib/src/localization.dart
@@ -109,7 +109,10 @@ class Localization {
   }
 
   String _resolvePlural(String key, String subKey) {
-    var resource = _resolve('$key.$subKey');
+    final tag = '$key.$subKey';
+    var resource = _resolve(tag);
+    if (resource == tag && subKey != 'other')
+      resource = _resolve('$key.other');
     return resource;
   }
 
@@ -120,6 +123,7 @@ class Localization {
         EasyLocalization.logger.warning('Localization key [$key] not found');
       }
       if (_fallbackTranslations == null) {
+
         return key;
       } else {
         resource = _fallbackTranslations?.get(key);

diff --git a/test/easy_localization_test.dart b/test/easy_localization_test.dart
@@ -330,7 +330,7 @@ void main() {
       });
 
       test('other as fallback', () {
-        expect(Localization.instance.plural('hat_other', -1), 'other hats');
+        expect(Localization.instance.plural('hat_other', 1), 'other hats');
       });
 
       test('with number format', () {