r18n-core 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9a66e4eaa844bf54da00c46f9cee94cc17aeae
-  data.tar.gz: 96922df7f0f8e8a2a1aaf0780209fc8cc31a65f8
+  metadata.gz: d01ca11bf73f68b371d98508755f5fcbd8360290
+  data.tar.gz: 32074b227246a93c6ff71f5748ab4914c8f50285
 SHA512:
-  metadata.gz: 76c32b637fdd52c47d95c4c7231ed1de6cd917bcc975a3b05ef2a459a488a9633729f641222f90fe8e14e3eb0d98c0e6d796e24a2565beca76496f91cc675a26
-  data.tar.gz: ea6dd26bae7c951de5507ad81976677bbf44d37449f0ea70e6e38eb29f5d68997beed374acddbdf46eaf5e702b4a234bffab8f43ed9dc0f7bd3341a648d84d47
+  metadata.gz: ecba6af5cf4a56c6c1b42895c66e258f1f03bea79dc2aa9545289c43fe76d2cc87c8e7d49dff796529fb9f1ff70fb86d74d62279caef66dee32ee1bc2232c72f
+  data.tar.gz: 7592e2e32e74a06d8a6db4383c97ddaa83813c52ac53dec5190f6cc8f715d47ad72e99a2b1aac70b6a52500eb31331d5e242589bfc9256e02ad96b6d6a72ccd9

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 2.1.6 (Berlin)
+* Better `TranslatedString` → `String` converting (by Patrik Rak).
+* Add Ruby on Rails 5 support.
+
 ## 2.1.5 (මාතර)
 * Fix Ruby 2.4 support (by Alexander Popov)
 

data/lib/r18n-core/translated_string.rb

@@ -29,11 +29,9 @@ module R18n
     # Returns a new string object containing a copy of +str+, which translated
     # for +path+ to +locale+
     def initialize(value, locale, path, filters = nil)
-      value = value.to_s if value.is_a? TranslatedString
-      super(value)
+      super(value.to_s)
       @filters = filters
       @locale  = locale
-      @value   = value
       @path    = path
     end
 
@@ -55,9 +53,9 @@ module R18n
     # Override to_s to make string html safe if `html_safe` method is defined.
     def to_s
       if respond_to? :html_safe
-        @value.html_safe
+        super.html_safe
       else
-        @value
+        String.new(super)
       end
     end
 

data/lib/r18n-core/translation.rb

@@ -93,7 +93,7 @@ module R18n
           when String
             c = { locale: locale, path: path }
             v = @filters.process_string(:passive, value, c, [])
-            value = TranslatedString.new(v, locale, path, @filter)
+            value = TranslatedString.new(v, locale, path, @filters)
           when Typed
             value.locale = locale
             value.path   = path

data/lib/r18n-core/version.rb

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

data/spec/translation_spec.rb

@@ -18,6 +18,21 @@ describe R18n::Translation do
     expect(i18n.one | 'default').to eq('One')
   end
 
+  it "returns strings which can be used as normal strings" do
+    i18n = R18n::I18n.new('en', DIR)
+    expect(i18n.not.exists).not_to be_translated
+    expect(i18n.not.exists.to_s).to be_kind_of(String)
+    expect(i18n.not.exists.to_s.split.first).to be_kind_of(String)
+    expect(i18n.not.exists.to_s.split.first.to_s).to be_kind_of(String)
+
+    expect(i18n.one).to be_translated
+    expect(i18n.one.to_s).to be_kind_of(String)
+    expect(i18n.one.to_s.split.first).to be_kind_of(String)
+    expect(i18n.one.to_s.split.first.to_s).to be_kind_of(String)
+    expect(i18n.one.split.first).to be_kind_of(String)
+    expect(i18n.one.split.first.to_s).to be_kind_of(String)
+  end
+
   it "returns html escaped string" do
     klass = Class.new(R18n::TranslatedString) do
       def html_safe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies: []
 description: |2
       R18n is a i18n tool to translate your Ruby application.