gettext_i18n_rails 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 494dbc18eaabefe310729f46cab58dacbbed797a
-  data.tar.gz: c7ad9fc663c123b2f91a2dec6b94efa826c18d9c
+SHA256:
+  metadata.gz: 3259e666c1481870b3fc42ef15f9122f550dacb20676dc94ed6f2626a85d881f
+  data.tar.gz: f9c946d849eefe7fb3bc282e82075e05c1e1343f3bea58b57466a77c0a95dfe3
 SHA512:
-  metadata.gz: fb9b2a7a3c39a1f050f89f5512e850c16af924cd94d5be26801093738a87fe3c59743e71e1bf246671e0de5d0d0d480aa3985238db835e33c6eb96ae4de0f7d4
-  data.tar.gz: c14407cf69d6c638b6f8966f9afa0efb88e77084801eb3498fd75bd91a2a7498e7f6245a21bd57a44ba7f3110037c80d3e4665a5e768676da14a77e7b47fdc8d
+  metadata.gz: 8cf6c57bfb859e54b78ee70b4dc19429b49d9d5eb328ccc4b281f1217b81626daa61a68fefd48fee422305678eeab649a3f936d2e5b25d7d3dc4d1d182cf3ff5
+  data.tar.gz: c7e08204399174c13dec49e3d10389eb1a2316e1aa2e3cfad9e40b5eaf6bf40aebfc7230fef67dcdb831e443c25960065e0fd970962f68775e2b54efeae2a8ba

data/lib/gettext_i18n_rails/action_controller.rb

@@ -1,8 +1,19 @@
-class ActionController::Base
-  def set_gettext_locale
-    requested_locale = params[:locale] || session[:locale] || cookies[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale
-    locale = FastGettext.set_locale(requested_locale)
-    session[:locale] = locale
-    I18n.locale = locale # some weird overwriting in action-controller makes this necessary ... see I18nProxy
+# Autoloading in initializers is deprecated on rails 6.0.  This delays initialization using the on_load
+# hooks, but does not change behaviour for existing rails versions.
+path_controller = ->() {
+  class ::ActionController::Base
+    def set_gettext_locale
+      requested_locale = params[:locale] || session[:locale] || cookies[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE'] || I18n.default_locale
+      locale = FastGettext.set_locale(requested_locale)
+      session[:locale] = locale
+      I18n.locale = locale # some weird overwriting in action-controller makes this necessary ... see I18nProxy
+    end
   end
-end
+}
+if defined?(Rails) && Rails::VERSION::MAJOR >= 6
+  ActiveSupport.on_load(:action_controller_base) do
+    path_controller.call
+  end
+else
+  path_controller.call
+end

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,6 +16,7 @@ module GettextI18nRails
     end
 
     def translate(locale, key, options)
+      current_locale = FastGettext.set_locale locale
       if gettext_key = gettext_key(key, options)
         translation =
           plural_translate(gettext_key, options) || FastGettext._(gettext_key)
@@ -24,6 +25,8 @@ module GettextI18nRails
         result = backend.translate(locale, key, options)
         (RUBY19 and result.is_a?(String)) ? result.force_encoding("UTF-8") : result
       end
+    ensure
+      FastGettext.set_locale current_locale
     end
 
     def method_missing(method, *args)

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.0'
+  Version = VERSION = '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2022-10-13 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,9 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Simple FastGettext Rails integration.
 test_files: []