r18n-core 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11bc4dc5f4a8d95074acf505f1da8e2ee403bdca
-  data.tar.gz: cbce6b1aa70f9ae9b07b9c7b737c631989e1fba8
+  metadata.gz: 68ff840b9a7642dd18fca8af6172a1fc3cc859e5
+  data.tar.gz: c2fd43948dcbf36b58a43016cc98ee624fe90ebc
 SHA512:
-  metadata.gz: 0717a656b81a5b0e85d83375099077f3d65d322e6ed69c4ec042fb418f812340aabf8a36fc48bc38fd942ebcfb6c66c871b6a1fec5c13f0801b22619d5998241
-  data.tar.gz: 77ff86c5ba4493c592031d83975bc200a70cf782e5c602130cf6c37fbf23f2a1148043a0ceb277cc525c1742968dbac196c6f0780d8042c01e3d9336d0ac0560
+  metadata.gz: 5167736c090fca6199ab4e0c8ec06142287fbf87c2ae24e3b1dbecc874e398a47872cd55e75feee6560c2253a7121eb622b09f432ebc3525acfeffc9bf2714d9
+  data.tar.gz: 3079adcd2fea7198e10185f7d2510e3878cb91fbd51702d5075d731e219784f9df447975dd9150c0cfcf676a28491cca18e88fcdbc149a284e8c2edf7509b5b2

data/ChangeLog.md

@@ -1,3 +1,6 @@
+## 2.1.2 (Wien)
+* Fix Ruby 2.3 support.
+
 ## 2.1.1 (Barcelona)
 * Better sanity check for Accept-Language header (by Viktors Rotanovs).
 

data/lib/r18n-core/filters.rb

@@ -230,8 +230,7 @@ module R18n
 
   Filters.add(String, :variables) do |content, config, *params|
     cached_params = []
-    content = content.clone
-    content.gsub!(/\%\d/) do |key|
+    content.to_s.gsub(/\%\d/) do |key|
       i = key[1..-1].to_i
       unless cached_params.include? i - 1
         param = config[:locale].localize(params[i - 1])
@@ -243,7 +242,6 @@ module R18n
       end
       cached_params[i - 1]
     end
-    content
   end
 
   Filters.add(Untranslated, :untranslated) do |v, c, translated, untranslated|

data/lib/r18n-core/translated_string.rb

@@ -28,10 +28,12 @@ module R18n
 
     # Returns a new string object containing a copy of +str+, which translated
     # for +path+ to +locale+
-    def initialize(str, locale, path, filters = nil)
-      super(str)
+    def initialize(value, locale, path, filters = nil)
+      value = value.to_s if value.is_a? TranslatedString
+      super(value)
       @filters = filters
       @locale  = locale
+      @value   = value
       @path    = path
     end
 
@@ -53,9 +55,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
-        html_safe
+        @value.html_safe
       else
-        String.new(self)
+        @value
       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, @filters)
+            value = TranslatedString.new(v, locale, path, @filter)
           when Typed
             value.locale = locale
             value.path   = path

data/lib/r18n-core/version.rb

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

metadata

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