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

[rails.git] / vendor / plugins / globalize2 / lib / globalize / backend / pluralizing.rb

diff --git a/vendor/plugins/globalize2/lib/globalize/backend/pluralizing.rb b/vendor/plugins/globalize2/lib/globalize/backend/pluralizing.rb
index 80016f208bac4fc01f2e97c0f6c4079d9be08b51..753711d0b6ace1ef92bfc0bbd69ed11282099369 100644 (file)
--- a/vendor/plugins/globalize2/lib/globalize/backend/pluralizing.rb
+++ b/vendor/plugins/globalize2/lib/globalize/backend/pluralizing.rb
@@ -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)
       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
         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
         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
         end
 
         # Overwrite this method to return something other than a String


@@ -34,4 +49,4 @@ module Globalize
         end
     end
   end
         end
     end
   end

-end
\ No newline at end of file
+end