rails-i18n 0.6.1 → 0.6.2

data/lib/rails_i18n.rb

@@ -1 +1,2 @@
+require 'rails_i18n/unicode'
 require 'rails_i18n/railtie'

data/lib/rails_i18n/common_pluralizations/one_upto_two_other.rb

@@ -4,7 +4,7 @@ module RailsI18n
   module Pluralization
     module OneUptoTwoOther
       def self.rule
-        lambda { |n| (0...2).cover?(n) ? :one : :other }
+        lambda { |n| n >= 0 && n < 2 ? :one : :other }
       end
 
       def self.with_locale(locale)

data/lib/rails_i18n/unicode.rb

@@ -0,0 +1 @@
+$KCODE = "U" if RUBY_VERSION < '1.9' && $KCODE == 'NONE'

data/rails/pluralization/lag.rb

@@ -5,7 +5,7 @@ module RailsI18n
         lambda do |n|
           if n == 0
             :zero
-          elsif (0...2).cover?(n)
+          elsif n > 0 && n < 2
             :one
           else
             :other

data/rails/transliteration/uk.rb

@@ -25,9 +25,9 @@ module RailsI18n
               when 'Щ'
                 lookahead_upcase 'SHCH'
               when 'г'
-                behind =~ /з/i ? 'gh' : 'h'
+                behind =~ /[зЗ]/ ? 'gh' : 'h'
               when 'Г'
-                behind =~ /з/i ? lookahead_upcase('GH') : 'H'
+                behind =~ /[зЗ]/ ? lookahead_upcase('GH') : 'H'
               when 'є'
                 letter?(behind) ? 'ie' : 'ye'
               when 'Є'
@@ -60,22 +60,45 @@ module RailsI18n
 
         private
 
-        def behind
-          @pre_match && @pre_match[-1]
-        end
+        if RUBY_VERSION < '1.9'
+          # two bytes will be enough for Cyrillic
+          class_eval <<-END, __FILE__, __LINE__ + 1
+            def behind
+              tail = @pre_match && @pre_match[-2..-1]
+              tail && tail.split(//).last
+            end
+
+            def ahead
+              @post_match && @post_match[0..1].split(//).first
+            end
+          END
+        else
+          class_eval <<-END, __FILE__, __LINE__ + 1
+            def behind
+              @pre_match && @pre_match[-1]
+            end
 
-        def ahead
-          @post_match && @post_match[0]
+            def ahead
+              @post_match && @post_match[0]
+            end
+          END
         end
 
         def downcased?(symbol)
-          symbol =~ /\p{Ll}/
+          symbol =~ downcased_regexp
+        end
+
+        def downcased_regexp
+          @downcased_regexp ||= /[а-яґєії]/
         end
         
         # apostrophe can be inside a word
-        # TODO what about hyphen?
         def letter?(symbol)
-          symbol =~ /[\p{L}'’]/
+          symbol =~ letter_regexp
+        end
+
+        def letter_regexp
+          @letter_regexp ||= /[а-яґєіїА-ЯҐЄІЇ'’]/
         end
 
         def lookahead_upcase(word)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-i18n
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &14419600 !ruby/object:Gem::Requirement
+  requirement: &7186520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *14419600
+  version_requirements: *7186520
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14418620 !ruby/object:Gem::Requirement
+  requirement: &7186000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *14418620
+  version_requirements: *7186000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14414740 !ruby/object:Gem::Requirement
+  requirement: &7185460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *14414740
+  version_requirements: *7185460
 - !ruby/object:Gem::Dependency
   name: i18n-spec
-  requirement: &14441660 !ruby/object:Gem::Requirement
+  requirement: &7184920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *14441660
+  version_requirements: *7184920
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &14438360 !ruby/object:Gem::Requirement
+  requirement: &7184380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0rc
   type: :development
   prerelease: false
-  version_requirements: *14438360
+  version_requirements: *7184380
 description: A set of common locale data and translations to internationalize and/or
   localize your Rails applications.
 email: rails-i18n@googlegroups.com
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rails_i18n/railtie.rb
+- lib/rails_i18n/unicode.rb
 - lib/rails_i18n/common_pluralizations/only_one.rb
 - lib/rails_i18n/common_pluralizations/east_slavic.rb
 - lib/rails_i18n/common_pluralizations/west_slavic.rb