gettext_i18n_rails 1.6.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7e13868251188849a0e71487be9790ad9e66d7d
-  data.tar.gz: 10d5e5e9131dba2cffff73ab5f060b24fe0ab865
+SHA256:
+  metadata.gz: a7655d318d6306ad7bf1ec675b5c27d0afbad82e1098f054dc3585aab0254666
+  data.tar.gz: 6dcd1f9206c5c47d2d0e91ea05d285ac56e0c2458dfb33058b5562f7d3be991c
 SHA512:
-  metadata.gz: 12d52e816ac508ce66b385d39f1b8200f87c5a2c947811fb492328dee287b3dc047a1099488d09f02c7a3d471c90a625739f3b40b49e6ece9b4cc2dbf8e82ea1
-  data.tar.gz: c756452898b99bcd787faaa3abb01719b8defaf6c97de6ffda3f8c1e276cf1318021da45ad1be695020aa429ed42ed68fa0eaf930886b36fce3fcad815d9c8b5
+  metadata.gz: fb538477f76f4fc7ff990e0c1f49cf6cfe2d5a9b9c73af6aca032b081dcff1c829dbbbaab5f2ad745e700912f216554486388263beb68a5ccbd77b2aa42a0c64
+  data.tar.gz: 73ffa140108551a6434e4265c6e48aa1344fa563f0f67f131f7b8d5b3c41007b2913bb2b613766207dbd3f0eabe37731b5d72734b800ec01bfeee681b9333985

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,13 +16,20 @@ 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)
+          if RUBY19 && result.is_a?(String)
+           result = result.dup if result.frozen?
+           result.force_encoding("UTF-8")
+          else
+            result
+          end
+        end
       end
     end
 

data/lib/gettext_i18n_rails/base_parser.rb

@@ -23,10 +23,10 @@ module GettextI18nRails
       return true if @library_loaded
 
       loaded = libraries.detect do |library|
-        begin
+        if Gem::Specification.find_all_by_name(library).any?
           require library
           true
-        rescue LoadError
+        else
           false
         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/railtie.rb

@@ -7,11 +7,8 @@ module GettextI18nRails
     config.gettext_i18n_rails.use_for_active_record_attributes = true
 
     rake_tasks do
-      begin
-        gem "gettext", ">= 3.0.2"
+      if Gem::Specification.find_all_by_name("gettext", ">= 3.0.2").any?
         require 'gettext_i18n_rails/tasks'
-      rescue Gem::LoadError
-        # no gettext available, no tasks for you!
       end
     end
 

data/lib/gettext_i18n_rails/tasks.rb

@@ -29,7 +29,7 @@ namespace :gettext do
 
   def gettext_msgcat_options
     config = (Rails.application.config.gettext_i18n_rails.msgcat if defined?(Rails.application))
-    config || gettext_default_options
+    config || gettext_default_options - %w[--location]
   end
 
   def gettext_xgettext_options

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '1.6.0'
+  Version = VERSION = '1.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2023-04-26 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
@@ -217,16 +217,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Simple FastGettext Rails integration.
 test_files: []