r18n-core 2.1.8 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bbaa39e76a973790722f6ff6bc226c48f431f81
-  data.tar.gz: 4d8d2cdc188540d8a5740e63f06c0105efbaf370
+  metadata.gz: 710530bf79e2d31499094507a16c89fecda6c4be
+  data.tar.gz: 2fd094bdbc14d67b78bddb7b827ce384f16320c0
 SHA512:
-  metadata.gz: bb03b1cf8bba47d9a6fc74d4f7226e0e313cf53eac972bac848f5b3c8b032f8da3b29a9ceec96ff8cf86aa1b61aa3e195f5223699b615e880aec147fa023750b
-  data.tar.gz: 3cd414164ccfe5cafdc076acfdf3a0f3e2f4408a58e37709ce54d63cdf1a36e51d051c931e36fceceec0d462eb5b860a8043c9b794d4d0a46da70ae2dc26f10c
+  metadata.gz: 3e65ed82bdf22bdce12a170f7ac84512a8b9ad6d7c758bc090da96a03f9d0ccdf2038c81e33da1669c54847c1babcd85d4744a142d7f8d967d0162deb89e5efc
+  data.tar.gz: d6b7573f5739b1723681a9aab973a8acf816b9fdbfd22233bf724b214eeadcb71096ee77b4f40478f3195631649eb2713a178175573c3fa95d3ae67e7a8eb46e

data/ChangeLog.md

@@ -1,3 +1,12 @@
+# Change Log
+
+## 2.2 (La Habana)
+* Change date format in `en` locale to `YYYY-MM-DD` (by Alexander Popov).
+* Add `TranslatedString#as_json` for ActiveSupport compatibility (by Tim Craft).
+* Fix `TranslatedString#html_safe?` behaviour (by Tim Craft).
+* Fix unsupported `LANG` environment (by Chris Poirier).
+* Fix `Locale#localize` method for `DateTime` objects (by Alexander Popov).s
+
 ## 2.1.8 (Ѣ)
 * Fix `true` and `false` keys support (by Alexander Popov).
 

data/README.md

@@ -324,8 +324,8 @@ R18n has some built-in time formats for locales: `:human`, `:full` and
 ```ruby
 l Time.now, :human #=> "now"
 l Time.now, :full  #=> "August 9th, 2009 21:47"
-l Time.now         #=> "08/09/2009 21:41"
-l Time.now.to_date #=> "08/09/2009"
+l Time.now         #=> "2009-08-09 21:41"
+l Time.now.to_date #=> "2009-08-09"
 ```
 
 ### Model

data/Rakefile

@@ -1,5 +1,3 @@
-require 'rubygems'
-
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 

data/lib/r18n-core/locale.rb

@@ -159,7 +159,7 @@ module R18n
         return month_standalone[obj.month - 1] if :month == format
         return obj.to_s if :human == format and not params.first.is_a? I18n
 
-        type = obj.is_a?(Date) ? 'date' : 'time'
+        type = obj.is_a?(Date) && !obj.is_a?(DateTime) ? 'date' : 'time'
         format = :standard unless format
 
         unless [:human, :full, :standard].include? format
@@ -224,7 +224,8 @@ module R18n
     # “yesterday”. In +now+ you can set base time, which be used to get relative
     # time. For special cases you can replace it in locale’s class.
     def format_time_human(time, i18n, now = Time.now, *params)
-      minutes = (time - now) / 60.0
+      diff = time - now
+      minutes = time.is_a?(DateTime) ? diff * 24 * 60.0 : diff / 60.0
       diff = minutes.abs
       if (diff > 24 * 60) or (time.mday != now.mday and diff > 12 * 24)
         format_time(format_date_human(time.to_date, i18n, now.to_date), time)

data/lib/r18n-core/translated_string.rb

@@ -45,9 +45,9 @@ module R18n
       true
     end
 
-    # Mark translated string as html safe, because R18n has own escape system.
+    # Return true if `html_safe` method is defined, otherwise false.
     def html_safe?
-      true
+      respond_to? :html_safe
     end
 
     # Override to_s to make string html safe if `html_safe` method is defined.
@@ -59,6 +59,11 @@ module R18n
       end
     end
 
+    # Define `as_json` for ActiveSupport compatibility.
+    def as_json(options = nil)
+      to_str
+    end
+
     # Override marshal_dump to avoid Marshalizing filter procs
     def _dump(limit)
       [@locale.code, @path, to_str].join(":")

data/lib/r18n-core/translation.rb

@@ -83,7 +83,7 @@ module R18n
     # Add another hash with +translations+ for some +locale+. Current data is
     # more priority, that new one in +translations+.
     def merge!(translations, locale)
-      translations.each_pair do |name, value|
+      (translations || { }).each_pair do |name, value|
         if not @data.has_key? name
           path = @path.empty? ? name : "#{@path}.#{name}"
           case value

data/lib/r18n-core/version.rb

@@ -1,3 +1,3 @@
 module R18n
-  VERSION = '2.1.8'.freeze unless defined? R18n::VERSION
+  VERSION = '2.2.0'.freeze unless defined? R18n::VERSION
 end

data/locales/en-gb.rb

@@ -3,6 +3,8 @@ require File.join(File.dirname(__FILE__), 'en')
 module R18n::Locales
   class EnGb < En
     set title: 'British English',
-        sublocales: %w{en}
+        sublocales: %w{en},
+
+        date_format: '%d/%m/%Y'
   end
 end

data/locales/en.rb

@@ -12,7 +12,7 @@ module R18n
                         September October November December},
         month_abbrs: %w{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec},
 
-        date_format: '%d/%m/%Y',
+        date_format: '%Y-%m-%d',
         full_format: '%e of %B',
         year_format: '_, %Y',
 

data/spec/locale_spec.rb

@@ -131,6 +131,34 @@ describe R18n::Locale do
       '1st of January, 1969 00:00')
   end
 
+  it "localizes date-times for human" do
+    day    = 1.0
+    hour   = day / 24
+    minute = hour / 60
+    second = minute / 60
+    zero   = DateTime.new(1970)
+    p = [:human, R18n::I18n.new('en'), zero]
+
+    expect(@en.localize( zero + 7  * day,    *p)).to eq('8th of January 00:00')
+    expect(@en.localize( zero + 50 * hour,   *p)).to eq('after 2 days 02:00')
+    expect(@en.localize( zero + 25 * hour,   *p)).to eq('tomorrow 01:00')
+    expect(@en.localize( zero + 70 * minute, *p)).to eq('after 1 hour')
+    expect(@en.localize( zero + hour,        *p)).to eq('after 1 hour')
+    expect(@en.localize( zero + 38 * minute, *p)).to eq('after 38 minutes')
+    expect(@en.localize( zero + 5 * second,  *p)).to eq('now')
+    expect(@en.localize( zero - 15 * second, *p)).to eq('now')
+    expect(@en.localize( zero - minute,      *p)).to eq('1 minute ago')
+    expect(@en.localize( zero - hour + 59 * second, *p)).to eq('59 minutes ago')
+    expect(@en.localize( zero - 2  * hour,   *p)).to eq('2 hours ago')
+    expect(@en.localize( zero - 13 * hour,   *p)).to eq('yesterday 11:00')
+    expect(@en.localize( zero - 50 * hour,   *p)).to eq('3 days ago 22:00')
+
+    expect(@en.localize( zero - 9  * day,  *p)).to eq(
+      '23rd of December, 1969 00:00')
+    expect(@en.localize( zero - 365 * day, *p)).to eq(
+      '1st of January, 1969 00:00')
+  end
+
   it "uses standard formatter by default" do
     expect(@ru.localize(Time.at(0).utc)).to eq('01.01.1970 00:00')
   end

data/spec/r18n_spec.rb

@@ -125,7 +125,7 @@ describe R18n do
   it "has l and t methods" do
     R18n.set('en')
     expect(t.yes).to eq('Yes')
-    expect(l(Time.at(0).utc)).to eq('01/01/1970 00:00')
+    expect(l(Time.at(0).utc)).to eq('1970-01-01 00:00')
   end
 
   it "has helpers mixin" do
@@ -135,7 +135,7 @@ describe R18n do
     expect(r18n).to  eq(obj)
     expect(i18n).to  eq(obj)
     expect(t.yes).to eq('Yes')
-    expect(l(Time.at(0).utc)).to eq('01/01/1970 00:00')
+    expect(l(Time.at(0).utc)).to eq('1970-01-01 00:00')
   end
 
   it "returns available translations" do

data/spec/translation_spec.rb

@@ -33,6 +33,15 @@ describe R18n::Translation do
     expect(i18n.one.split.first.to_s).to be_kind_of(String)
   end
 
+  it "returns strings compatible with activesupport json encoding" do
+    require 'active_support'
+
+    i18n = R18n::I18n.new('en', DIR)
+    json = ActiveSupport::JSON.encode(one: i18n.one)
+
+    expect(json).to eq('{"one":"One"}')
+  end
+
   it "returns strings by Boolean keys (true, false)" do
     i18n = R18n::I18n.new('en', DIR)
 
@@ -40,7 +49,7 @@ describe R18n::Translation do
     expect(i18n.boolean[false]).to eq('Boolean is false')
   end
 
-  it "returns html escaped string" do
+  it "returns html escaped string if html_safe is defined" do
     klass = Class.new(R18n::TranslatedString) do
       def html_safe
         '2'
@@ -52,6 +61,16 @@ describe R18n::Translation do
     expect(str.html_safe).to eq('2')
   end
 
+  it "returns unescaped string if html_safe is not defined" do
+    klass = Class.new(R18n::TranslatedString) do
+      undef_method :html_safe if method_defined?(:html_safe)
+    end
+    str = klass.new('a & b', nil, nil)
+
+    expect(str).not_to be_html_safe
+    expect(str.to_s).to eq('a & b')
+  end
+
   it "loads use hierarchical translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
     expect(i18n.in.another.level).to eq('Иерархический')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies: []
 description: |2
       R18n is a i18n tool to translate your Ruby application.
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: I18n tool to translate your Ruby application.