Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow _resolvePlural to search _fallbackTranslation values when trying to resolve a plural key #559

Merged
merged 7 commits into from
Sep 5, 2023
Merged

Allow _resolvePlural to search _fallbackTranslation values when trying to resolve a plural key #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20bdccf
resolve plural should not force fallback value to false
kyle-tbx Feb 17, 2023
54ea1c2
revert just for sanity check
kyle-tbx Feb 17, 2023
2557e2c
_resolvePlural _resolve fallback value should consider if _fallbackTr…
kyle-tbx Feb 17, 2023
82c1a1b
update intl version for compatibility
kyle-tbx Jun 5, 2023
db45bd2
Merge remote-tracking branch 'upstream/develop' into develop
kyle-tbx Jun 30, 2023
7c08532
Merge remote-tracking branch 'upstream/develop' into develop
kyle-tbx Sep 5, 2023
1620a74
- revert intl versions in pubspec.yaml
kyle-tbx Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/localization.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class Localization {
if (subKey == 'other') return _resolve('$key.other');

final tag = '$key.$subKey';
var resource = _resolve(tag, logging: false, fallback: false);
var resource = _resolve(tag, logging: false, fallback: _fallbackTranslations != null);
bw-flagship marked this conversation as resolved.
Show resolved Hide resolved
if (resource == tag) {
resource = _resolve('$key.other');
}
Expand Down
4 changes: 2 additions & 2 deletions test/easy_localization_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,12 +469,12 @@ void main() {
expect(Localization.instance.plural('hat_other', 1), 'other hats');
});

test('other as fallback and fallback translations priority',
test('two as fallback and fallback translations priority',
overridePrint(() {
printLog = [];
expect(
Localization.instance.plural('test_fallback_plurals', 2),
'2 seconds', // isNot('fallback two'),
'fallback two',
);
expect(printLog, isEmpty);
}));
Expand Down
Loading