rs_russian 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248a411f86b214a401416342ea41e062cdb18153
-  data.tar.gz: cb1b1ee82e4cdaa0eb7aa97e10e1b24e7035fe09
+  metadata.gz: f295ea63db240fb3c88171a84fb4fe382b06b15e
+  data.tar.gz: 964f4a1c737c49c9192e626dc51311c25cb19822
 SHA512:
-  metadata.gz: c802ad863ed8023ba8819b4d1696fe5a83e3193fc93d491f69dbd99aa59037e983f50469a32104dd2f33c3d90bfb153829d54754f8c82b7e64e98a803ce3862d
-  data.tar.gz: 3fc4bc908d5eee5f3fef505031eae07779c586f4ad7e259ca78f7e0b40c9f73686805bdc1783e4b4a8638c89373b03c09826ac8d36a49b9879fa8c6725a97d15
+  metadata.gz: fba8338eb610117b005814c079649d953fb8db53ced331a98e0775f9c9750358f35ef2be2e248bd49ed9e49fc694c8df8592741f2f1eab025990f45fbaecce3d
+  data.tar.gz: fd886e2f2b41ba97e584db222986ca9d59fc471947c61d8b0d172287272c7956a14f5c2753665f0ea5f2f645dac1c6939b7f25398db5a656aedecc2a3e95d285

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rs_russian (0.9.1)
+    rs_russian (0.9.2)
       activesupport (>= 3.0.0, < 5.0.0)
       i18n (>= 0.6.0, < 0.8.0)
       unicode (~> 0.4.4)

data/lib/russian/locale/datetime.rb

@@ -7,28 +7,28 @@
   :ru => {
     :date => {
       :abbr_day_names => lambda { |key, options|
-        if options[:format] && options[:format] =~ Russian::LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH
+        if options[:format] && options[:format] =~ Russian::LOCALIZE_STANDALONE_ABBR_DAY_NAMES_MATCH && !Russian.force_standalone
           :'date.common_abbr_day_names'
         else
           :'date.standalone_abbr_day_names'
         end
       },
       :day_names => lambda { |key, options|
-        if options[:format] && options[:format] =~ Russian::LOCALIZE_STANDALONE_DAY_NAMES_MATCH
+        if options[:format] && options[:format] =~ Russian::LOCALIZE_STANDALONE_DAY_NAMES_MATCH && !Russian.force_standalone
           :'date.standalone_day_names'
         else
           :'date.common_day_names'
         end
       },
       :abbr_month_names => lambda { |key, options|
-        if options[:format] && options[:format] =~ Russian::LOCALIZE_ABBR_MONTH_NAMES_MATCH
+        if options[:format] && options[:format] =~ Russian::LOCALIZE_ABBR_MONTH_NAMES_MATCH && !Russian.force_standalone
           :'date.common_abbr_month_names'
         else
           :'date.standalone_abbr_month_names'
         end
       },
       :month_names => lambda { |key, options|
-        if options[:format] && options[:format] =~ Russian::LOCALIZE_MONTH_NAMES_MATCH
+        if options[:format] && options[:format] =~ Russian::LOCALIZE_MONTH_NAMES_MATCH && !Russian.force_standalone
           :'date.common_month_names'
         else
           :'date.standalone_month_names'

data/lib/russian/rails_admin_datetime.rb

@@ -0,0 +1,43 @@
+require 'rails_admin/config/fields/types/datetime'
+
+module RailsAdmin
+  module Config
+    module Fields
+      module Types
+        class Datetime < RailsAdmin::Config::Fields::Base
+          def parse_input(params)
+            str = params[name]
+            unless I18n.locale == :en
+              strftime_format.to_s.scan(/%[AaBbp]/) do |match|
+                case match
+                when '%B'
+                  english = I18n.t('date.month_names', :locale => :en)[1..-1]
+                  common_month_names = I18n.t('date.common_month_names')[1..-1]
+                  common_month_names.each_with_index {|m, i| str = str.gsub(/#{m}/i, english[i]) }
+                when '%b'
+                  english = I18n.t('date.abbr_month_names', :locale => :en)[1..-1]
+                  common_abbr_month_names = I18n.t('date.common_abbr_month_names')[1..-1]
+                  common_abbr_month_names.each_with_index {|m, i| str = str.gsub(/#{m}/i, english[i]) }
+                end
+              end
+            end
+            params[name] = parser.parse_string(str) if params[name]
+          end
+
+          register_instance_option :formatted_value do
+            ret = if time = (value || default_value)
+              opt = {format: strftime_format, standalone: true}
+              Russian.force_standalone = true
+              r = ::I18n.l(time, opt)
+              Russian.force_standalone = false
+              r
+            else
+              ''.html_safe
+            end
+            ret
+          end
+        end
+      end
+    end
+  end
+end

data/lib/russian/version.rb

@@ -1,3 +1,3 @@
 module Russian
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/russian.rb

@@ -18,6 +18,8 @@ module Russian
 
   autoload :Transliteration, 'transliteration'
 
+  cattr_accessor :force_standalone
+
   # Russian locale
   LOCALE = :'ru'
 
@@ -120,3 +122,7 @@ end
 
 Russian.init_i18n
 
+if Object.const_defined?('RailsAdmin')
+  require 'rails_admin_datetime'
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs_russian
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - glebtv
@@ -138,6 +138,7 @@ files:
 - lib/russian/locale/datetime.yml
 - lib/russian/locale/pluralization.rb
 - lib/russian/locale/transliterator.rb
+- lib/russian/rails_admin_datetime.rb
 - lib/russian/russian_rails.rb
 - lib/russian/transliteration.rb
 - lib/russian/version.rb