st_tools 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a7fcb770812f74e220c7964ea4f065807e643d6
-  data.tar.gz: 692c8ba12cd6a0bc6d55f01e78e3b22653bc5978
+  metadata.gz: e496301e5474b3aa17cde2db505de4fe92cc1486
+  data.tar.gz: fc10191234b418a63d073498e2fadf1569fe0b38
 SHA512:
-  metadata.gz: 9b3ccdc959bbaa8072d2753949442ec04cd56a1035ba0ad96106dac7edf8d3c1209d3b79658811715e9412fcfc068bb66a13cf7a328a40dab4240586af180a8e
-  data.tar.gz: d5c7bbe1d071cc8d3b60581041f64e902d2e11749844115f61ea4ac03126b221a541cc92ee7457472fca679af07b3da16fe8fc5fd1130ed7b2239e0b4b3b9f61
+  metadata.gz: 96b78f8cc674be22b5418a5e2a97613f982ac0d0ca20faae3161787621136ffdc6a4815277d47ae27251269d58745cab5a32061df12ae5708624be410fced82b
+  data.tar.gz: b36d661ed52963ba0756d9b48162c8ae62e7daf03dbf0518999697094ea8c4c297630d1ef8e8e28fce8e176f5472cd4029ac89e368f7407e856fd3718c0d065e

data/lib/i18n/en.yml

@@ -85,4 +85,4 @@ en:
     pretty_list:
       and: and
       or: or
-
+    god_socr: ""

data/lib/i18n/ru.yml

@@ -62,3 +62,4 @@ ru:
     pretty_list:
       and: и
       or: или
+    god_socr: " г."

data/lib/st_tools/human.rb

@@ -268,7 +268,7 @@ module StTools
 
     def self.format_time2_date(timestamp, format, god)
       res = I18n.l(timestamp, :format => "d#{format.to_s}".to_sym, locale: StTools.configuration.locale)
-      res += " г." if god && StTools.configuration.locale == :ru
+      res += I18n.t("st_tools.god_socr", locale: StTools.configuration.locale) if god && format.to_sym == :human
       res
     end
 

data/lib/st_tools/version.rb

@@ -1,3 +1,3 @@
 module StTools
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/test/human_lib_format_time2_spec.rb

@@ -22,6 +22,7 @@ describe 'Проверка методов StTools::Human.format_time2 (:ru)' do
       StTools.configure { |config| config.locale = :ru }
       test = ::StTools::Human.format_time2(Time.now, :full, :full)
       expect(test).to match(/\d{2}\/\d{2}\/\d{4}/)
+      expect(test).to_not match(/г\./)
       expect(test).to match(/\d{2}\:\d{2}\:\d{2}/)
     end
 
@@ -29,6 +30,7 @@ describe 'Проверка методов StTools::Human.format_time2 (:ru)' do
       StTools.configure { |config| config.locale = :ru }
       test = ::StTools::Human.format_time2(Time.now, :full, :short)
       expect(test).to match(/\d{2}\/\d{2}\/\d{4}/)
+      expect(test).to_not match(/г\./)
       expect(test).to_not match(/\d{2}\:\d{2}\:\d{2}/)
     end
 end
@@ -38,6 +40,7 @@ describe 'Проверка методов StTools::Human.format_time2 (:en)' do
     StTools.configure { |config| config.locale = :en }
     test = ::StTools::Human.format_time2(Time.now, :human, :full)
     expect(test).to match(/[a-zA-Z]{3,10}/)
+    expect(test).to_not match(/г\./)
     expect(test).to match(/\d{2}\:\d{2}\:\d{2}/)
   end
 
@@ -45,6 +48,7 @@ describe 'Проверка методов StTools::Human.format_time2 (:en)' do
     StTools.configure { |config| config.locale = :en }
     test = ::StTools::Human.format_time2(Time.now, :full, :full)
     expect(test).to match(/\d{2}\/\d{2}\/\d{4}/)
+    expect(test).to_not match(/г\./)
     expect(test).to match(/\d{2}\:\d{2}\:\d{2}/)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: st_tools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Stan Zhuravlev