russian 0.2.6 → 0.2.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+=== 0.2.7 - 5.05.2010
+
+* Fix using of standalone/non-standalone month names with %d/%e surroundings.
+* Улучшено распознавание формы названия месяца с strftime макросами %d/%e.
+
 === 0.2.6 - 25.03.2010
 
 * Minimum Rails 3.0b support: Added fourth parameter (options) defaulting to nil to Advanced backend localize method for compliance with i18n-0.3 [Nikolay V. Nemshilov]

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "russian"
-GEM_VERSION = "0.2.6"
+GEM_VERSION = "0.2.7"
 AUTHOR = "Yaroslav Markin"
 EMAIL = "yaroslav@markin.net"
 HOMEPAGE = "http://github.com/yaroslav/russian/"

data/lib/russian.rb

@@ -29,7 +29,7 @@ module Russian
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/russian/backend/advanced.rb

@@ -16,8 +16,8 @@ module I18n
     # for DateTime localization and usage of user-defined Proc (lambda) pluralization
     # methods in translation tables.
     class Advanced < Simple
-      LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%d|%e)?(\s*)(%b)/
-      LOCALIZE_MONTH_NAMES_MATCH = /(%d|%e)?(\s*)(%B)/
+      LOCALIZE_ABBR_MONTH_NAMES_MATCH = /(%d|%e)(.*)(%b)/
+      LOCALIZE_MONTH_NAMES_MATCH = /(%d|%e)(.*)(%B)/
       LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH = /^%a/
       LOCALIZE_STANDALONE_DAY_NAMES_MATCH = /^%A/
       
@@ -61,18 +61,18 @@ module I18n
 
         if lookup(locale, :"date.standalone_abbr_month_names")
           format.gsub!(LOCALIZE_ABBR_MONTH_NAMES_MATCH) do
-            $1 ? $1 + $2 + translate(locale, :"date.abbr_month_names")[object.mon] : 
-              $2 + translate(locale, :"date.standalone_abbr_month_names")[object.mon]
+            $1 + $2 + translate(locale, :"date.abbr_month_names")[object.mon]
           end
+          format.gsub!(/%b/, translate(locale, :"date.standalone_abbr_month_names")[object.mon])
         else
           format.gsub!(/%b/, translate(locale, :"date.abbr_month_names")[object.mon])
         end
 
         if lookup(locale, :"date.standalone_month_names")
           format.gsub!(LOCALIZE_MONTH_NAMES_MATCH) do
-            $1 ? $1 + $2 + translate(locale, :"date.month_names")[object.mon] : 
-              $2 + translate(locale, :"date.standalone_month_names")[object.mon]
+            $1 + $2 + translate(locale, :"date.month_names")[object.mon]
           end
+          format.gsub!(/%B/, translate(locale, :"date.standalone_month_names")[object.mon])
         else
           format.gsub!(/%B/, translate(locale, :"date.month_names")[object.mon])
         end

data/spec/i18n/locale/datetime_spec.rb

@@ -4,6 +4,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe I18n, "Russian Date/Time localization" do
   before(:all) do
+    Russian.init_i18n
     @date = Date.parse("1985-12-01")
     @time = Time.local(1985, 12, 01, 16, 05)
   end
@@ -43,6 +44,9 @@ describe I18n, "Russian Date/Time localization" do
     it "should use month names" do
       l(@date, :format => "%d %B").should == "01 декабря"
       l(@date, :format => "%e %B %Y").should == " 1 декабря 1985"
+      l(@date, :format => "<b>%d</b> %B").should == "<b>01</b> декабря"
+      l(@date, :format => "<strong>%e</strong> %B %Y").should == "<strong> 1</strong> декабря 1985"
+      l(@date, :format => "А было тогда %eе число %B %Y").should == "А было тогда  1е число декабря 1985"
     end
     
     it "should use standalone month names" do
@@ -54,6 +58,8 @@ describe I18n, "Russian Date/Time localization" do
       @date = Date.parse("1985-03-01")
       l(@date, :format => "%d %b").should == "01 марта"
       l(@date, :format => "%e %b %Y").should == " 1 марта 1985"
+      l(@date, :format => "<b>%d</b> %b").should == "<b>01</b> марта"
+      l(@date, :format => "<strong>%e</strong> %b %Y").should == "<strong> 1</strong> марта 1985"
     end
     
     it "should use standalone abbreviated month names" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Yaroslav Markin
@@ -14,7 +14,7 @@ autorequire: russian
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +03:00
+date: 2010-05-05 00:00:00 +04:00
 default_executable: 
 dependencies: []