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

Do not consider a plural node if it only has "other" with no count #312

Merged
merged 2 commits into from
Oct 29, 2018
Merged

Do not consider a plural node if it only has "other" with no count #312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab6e108
Do not consider a plural node if it only has "other" with no count
Gargron Oct 26, 2018
85278b0
Do not hard-code non-plural other case to "other"
Gargron Oct 27, 2018
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
5 changes: 5 additions & 0 deletions lib/i18n/tasks/plural_keys.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,14 @@ def plural_nodes(tree)
end

def plural_forms?(s)
return false if non_plural_other?(s)
s.present? && s.all? { |node| node.leaf? && plural_suffix?(node.key) }
end

def non_plural_other?(s)
s.size == 1 && s.first.leaf? && (!s.first.value.is_a?(String) || !s.first.value.include?('%{count}'))
end

def plural_suffix?(key)
PLURAL_KEY_SUFFIXES.include?(key)
end
Expand Down