cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the :en and :sl pluralizers to default to :other if a more

Browse source 
specific key does not exist. This then allows r16613 to be reverted
as there is no need to distinguish the cases. Fixes #2087.
This commit is contained in:
Tom Hughes 2009-07-21 20:23:07 +00:00
parent 78fd4588b8
commit 6af3f93761
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/initializers/i18n.rb
View file

@ -2,5 +2,3 @@ require 'globalize/i18n/missing_translations_log_handler'
I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
I18n.exception_handler = :missing_translations_log_handler
I18n.backend.add_pluralizer :sl, lambda { |c| c%100 == 1 ? :one : c%100 == 2 ? :two : (3..4).include?(c%100) ? :few : :other }

3
config/locales/sl.yml
View file

@ -210,9 +210,6 @@ sl:
nodes: "Vozlišča:"
part_of: "Del:"
also_part_of:
one: "tudi del poti {{related_ways}}"
two: "tudi del poti {{related_ways}}"
few: "tudi del poti {{related_ways}}"
other: "tudi del poti {{related_ways}}"
way_history:
way_history: "Zgodovina poti"

19
vendor/plugins/globalize2/lib/globalize/backend/pluralizing.rb vendored
View file

@ -6,7 +6,7 @@ module Globalize
def pluralize(locale, entry, count)
return entry unless entry.is_a?(Hash) and count
key = :zero if count == 0 && entry.has_key?(:zero)
key ||= pluralizer(locale).call(count)
key ||= pluralizer(locale).call(count, entry)
raise InvalidPluralizationData.new(entry, count) unless entry.has_key?(key)
translation entry[key], :plural_key => key
end
@ -25,7 +25,22 @@ module Globalize
end
def pluralizers
@pluralizers ||= { :en => lambda{|n| n == 1 ? :one : :other } }
@pluralizers ||= {
:en => lambda { |count, entry|
case count
when 1 then entry.has_key?(:one) ? :one : :other
else :other
end
},
:sl => lambda { |count, entry|
case count % 100
when 1 then entry.has_key?(:one) ? :one : :other
when 2 then entry.has_key?(:two) ? :two : :other
when 3,4 then entry.has_key?(:few) ? :few : :other
else :other
end
}
}
end
# Overwrite this method to return something other than a String