sunrise-cms 0.3.2 → 0.3.3

data/spec/models/i18n_backend.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe I18n do
+  before(:each) do
+    @date = Date.parse("2012-06-26")
+  end  
+  
+  context "uk" do
+    before(:each) do
+      I18n.locale = :uk
+    end
+    
+    it "should localize month name" do
+      I18n.l(@date, :format => "%d.%m.%Y").should == "26.06.2012"
+      I18n.l(@date, :format => "%d %B %Y").should == "26 червня 2012"
+    end
+  end
+  
+  context "ru" do
+    before(:each) do
+      I18n.locale = :ru
+    end
+    
+    it "should localize month name" do
+      I18n.l(@date, :format => "%d.%m.%Y").should == "26.06.2012"
+      I18n.l(@date, :format => "%d %B %Y").should == "26 июня 2012"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75020610 !ruby/object:Gem::Requirement
+  requirement: &74883580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *75020610
+  version_requirements: *74883580
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &75020160 !ruby/object:Gem::Requirement
+  requirement: &74883190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *75020160
+  version_requirements: *74883190
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &75019530 !ruby/object:Gem::Requirement
+  requirement: &74882520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *75019530
+  version_requirements: *74882520
 - !ruby/object:Gem::Dependency
   name: jbuilder
-  requirement: &75019240 !ruby/object:Gem::Requirement
+  requirement: &74882210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *75019240
+  version_requirements: *74882210
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &75018990 !ruby/object:Gem::Requirement
+  requirement: &74881960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75018990
+  version_requirements: *74881960
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &75018700 !ruby/object:Gem::Requirement
+  requirement: &74881680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '1.18'
   type: :runtime
   prerelease: false
-  version_requirements: *75018700
+  version_requirements: *74881680
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &75018470 !ruby/object:Gem::Requirement
+  requirement: &74881440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '3.4'
   type: :runtime
   prerelease: false
-  version_requirements: *75018470
+  version_requirements: *74881440
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &75018210 !ruby/object:Gem::Requirement
+  requirement: &74881180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *75018210
+  version_requirements: *74881180
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &75017930 !ruby/object:Gem::Requirement
+  requirement: &74880900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *75017930
+  version_requirements: *74880900
 - !ruby/object:Gem::Dependency
   name: cancan_namespace
-  requirement: &75017600 !ruby/object:Gem::Requirement
+  requirement: &74880580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75017600
+  version_requirements: *74880580
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &75017040 !ruby/object:Gem::Requirement
+  requirement: &74880010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 4.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *75017040
+  version_requirements: *74880010
 - !ruby/object:Gem::Dependency
   name: galetahub-enum_field
-  requirement: &75016680 !ruby/object:Gem::Requirement
+  requirement: &74879650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75016680
+  version_requirements: *74879650
 - !ruby/object:Gem::Dependency
   name: page_parts
-  requirement: &75016440 !ruby/object:Gem::Requirement
+  requirement: &74879410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75016440
+  version_requirements: *74879410
 - !ruby/object:Gem::Dependency
   name: meta_manager
-  requirement: &75016170 !ruby/object:Gem::Requirement
+  requirement: &74879150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75016170
+  version_requirements: *74879150
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &75015900 !ruby/object:Gem::Requirement
+  requirement: &74878890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75015900
+  version_requirements: *74878890
 - !ruby/object:Gem::Dependency
   name: rails-uploader
-  requirement: &75015590 !ruby/object:Gem::Requirement
+  requirement: &74878570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75015590
+  version_requirements: *74878570
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &75014750 !ruby/object:Gem::Requirement
+  requirement: &74877720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 2.10.1
   type: :development
   prerelease: false
-  version_requirements: *75014750
+  version_requirements: *74877720
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &75014210 !ruby/object:Gem::Requirement
+  requirement: &74877190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *75014210
+  version_requirements: *74877190
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &75013830 !ruby/object:Gem::Requirement
+  requirement: &74876820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 0.3.11
   type: :development
   prerelease: false
-  version_requirements: *75013830
+  version_requirements: *74876820
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &75013480 !ruby/object:Gem::Requirement
+  requirement: &74876460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +231,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75013480
+  version_requirements: *74876460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &74982350 !ruby/object:Gem::Requirement
+  requirement: &74845210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 3.3.0
   type: :development
   prerelease: false
-  version_requirements: *74982350
+  version_requirements: *74845210
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &74981930 !ruby/object:Gem::Requirement
+  requirement: &74844800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,7 +253,7 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *74981930
+  version_requirements: *74844800
 description: Sunrise is a Aimbulance CMS
 email: galeta.igor@gmail.com
 executables: []
@@ -334,6 +334,7 @@ files:
 - config/locales/defaults/ru.yml
 - config/locales/defaults/pluralize.rb
 - config/locales/defaults/en.yml
+- config/locales/defaults/datetime.rb
 - db/migrate/20120611095315_create_settings.rb
 - db/migrate/20111216144815_create_roles.rb
 - db/migrate/20111216144915_create_structures.rb
@@ -348,7 +349,6 @@ files:
 - lib/sunrise/utils/csv_document.rb
 - lib/sunrise/utils/mysql.rb
 - lib/sunrise/utils/transliteration.rb
-- lib/sunrise/utils/i18n_backend.rb
 - lib/sunrise/core_ext/string.rb
 - lib/sunrise/core_ext/array.rb
 - lib/sunrise/core_ext/i18n.rb
@@ -13028,6 +13028,7 @@ files:
 - spec/models/sunrise/abstract_model_spec.rb
 - spec/models/user_spec.rb
 - spec/models/structure_spec.rb
+- spec/models/i18n_backend.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/favicon.ico
@@ -13203,6 +13204,7 @@ test_files:
 - spec/models/sunrise/abstract_model_spec.rb
 - spec/models/user_spec.rb
 - spec/models/structure_spec.rb
+- spec/models/i18n_backend.rb
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/public/favicon.ico

data/lib/sunrise/utils/i18n_backend.rb

@@ -1,87 +0,0 @@
-# encoding: utf-8
-module Sunrise
-  module Utils
-  
-    # "Продвинутый" бекэнд для I18n.
-    # 
-    # Наследует Simple бекэнд и полностью с ним совместим. Добаляет поддержку 
-    # для отдельностоящих/контекстных названий дней недели и месяцев.
-    # Также позволяет каждому языку использовать собственные правила плюрализации,
-    # объявленные как Proc (<tt>lambda</tt>).
-    # 
-    #
-    # Advanced I18n backend.
-    #
-    # Extends Simple backend. Allows usage of "standalone" keys
-    # for DateTime localization and usage of user-defined Proc (lambda) pluralization
-    # methods in translation tables.
-    class I18nBackend < ::I18n::Backend::Simple
-      include ::I18n::Backend::Pluralization
-      
-      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/
-      
-      # Acts the same as +strftime+, but returns a localized version of the 
-      # formatted date string. Takes a key from the date/time formats 
-      # translations as a format argument (<em>e.g.</em>, <tt>:short</tt> in <tt>:'date.formats'</tt>).
-      #
-      #
-      # Метод отличается от <tt>localize</tt> в Simple бекэнде поддержкой 
-      # отдельностоящих/контекстных названий дней недели и месяцев.
-      #
-      #
-      # Note that it differs from <tt>localize</tt> in Simple< backend by checking for 
-      # "standalone" month name/day name keys in translation and using them if available.
-      #
-      # <tt>options</tt> parameter added for i18n-0.3 compliance.
-      def localize(locale, object, format = :default, options = nil)
-        raise ArgumentError, "Object must be a Date, DateTime or Time object. #{object.inspect} given." unless object.respond_to?(:strftime)
-        
-        type = object.respond_to?(:sec) ? 'time' : 'date'
-        # TODO only translate these if format is a String?
-        formats = translate(locale, :"#{type}.formats")
-        format = formats[format.to_sym] if formats && formats[format.to_sym]
-        # TODO raise exception unless format found?
-        format = format.to_s.dup
-
-        # TODO only translate these if the format string is actually present
-        # TODO check which format strings are present, then bulk translate then, then replace them
-
-        if lookup(locale, :"date.standalone_abbr_day_names")
-          format.gsub!(LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH, 
-            translate(locale, :"date.standalone_abbr_day_names")[object.wday])
-        end
-        format.gsub!(/%a/, translate(locale, :"date.abbr_day_names")[object.wday])
-        
-        if lookup(locale, :"date.standalone_day_names")
-          format.gsub!(LOCALIZE_STANDALONE_DAY_NAMES_MATCH, 
-            translate(locale, :"date.standalone_day_names")[object.wday])
-        end
-        format.gsub!(/%A/, translate(locale, :"date.day_names")[object.wday])
-
-        if lookup(locale, :"date.standalone_abbr_month_names")
-          format.gsub!(LOCALIZE_ABBR_MONTH_NAMES_MATCH) do
-            $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 + $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
-
-        format.gsub!(/%p/, translate(locale, :"time.#{object.hour < 12 ? :am : :pm}")) if object.respond_to? :hour
-        object.strftime(format)
-      end
-    end
-  end
-end