gettext_i18n_rails 1.8.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03205ca066f3c898e4da0ec0a8262e4fd0127498b5c975c0b5b2935062d146f5
-  data.tar.gz: c1d50f46d8a6e4805d3ddec69c4a1965fdafdc5b06ecea0534c2cb1e7cec4b45
+  metadata.gz: 7b2bd7b5e4d51e8b0c80eb37d3971b1fbc79ef33b9a35d06813e8910cba26bc2
+  data.tar.gz: ab2815bbe31652338bde0dd6e02bced7dc19f7fee67d21cd62dc5572ddc6e4d1
 SHA512:
-  metadata.gz: 660ee38d092d0538f4ced161e32c0976edbf58c2ce5a4230b32729787103728f18ba6e5435ef185314ff4696762c929c1578c2c240a5ce5ca35fe79d259ba824
-  data.tar.gz: 7fa2d67dbe95ab585c01dd3f8c988f20a23f3d46cfadc99da0b04acd41d87deb5d932a859a7d7dda6f90d137df661c704458d5091db0e2d084a389b39eba47db
+  metadata.gz: efa9360667d77c06a174969242cd4febf1e77400ac3292a4fa8fb3cd8e804101342986004a91478ed8753a50875f305b0e29baf1f11004ef713b78ba296d0f1a
+  data.tar.gz: 75050454e7a7ba7777a7841d42d79d9dde0d703829d5d6f9202919e2933363967fb346ec7b635eaf6b46bc52de55b9842f9de615f109c026104a450a9dd8b9bb

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -7,7 +7,7 @@ module ActiveModel
 
     def gettext_translation_for_attribute_name(attribute)
       attribute = attribute.to_s
-      if attribute.ends_with?('_id')
+      if attribute.end_with?('_id')
         humanize_class_name(attribute)
       else
         "#{inheritance_tree_root(self)}|#{attribute.split('.').map! {|a| a.humanize }.join('|')}"

data/lib/gettext_i18n_rails/backend.rb

@@ -16,13 +16,15 @@ module GettextI18nRails
     end
 
     def translate(locale, key, options)
-      if gettext_key = gettext_key(key, options)
-        translation =
-          plural_translate(gettext_key, options) || FastGettext._(gettext_key)
-        interpolate(translation, options)
-      else
-        result = backend.translate(locale, key, options)
-        (RUBY19 and result.is_a?(String)) ? result.force_encoding("UTF-8") : result
+      I18n.with_locale(locale) do
+        if gettext_key = gettext_key(key, options)
+          translation =
+            plural_translate(gettext_key, options) || FastGettext._(gettext_key)
+          interpolate(translation, options)
+        else
+          result = backend.translate(locale, key, options)
+          (RUBY19 and result.is_a?(String)) ? result.force_encoding("UTF-8") : result
+        end
       end
     end
 

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -9,7 +9,11 @@ module GettextI18nRails
     def self.convert_to_code(text)
       case @library_loaded
       when "haml"
-        Haml::Engine.new(text).precompiled()
+        if Haml::VERSION.split('.').first.to_i <= 5
+          Haml::Engine.new(text).precompiled()
+        else
+          Haml::Engine.new.call(text)
+        end
       when "hamlit"
         Hamlit::Engine.new.call(text)
       end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '1.8.1'
+  Version = VERSION = '1.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: hamlit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,35 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sexp_processor
+  name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sexp_processor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -209,7 +209,7 @@ homepage: http://github.com/grosser/gettext_i18n_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Simple FastGettext Rails integration.
 test_files: []