gettext_i18n_rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58dd0ea4dd5fe83360d49416e2c333bcac2d58c160a7768c30c97b226d80b62
-  data.tar.gz: 6a58912bda3bbba588a52da7ad9cdc44944c3ebbeac267b0109da51e76273906
+  metadata.gz: e54b27b13a1bc165ba1d15d79124499d2adf0560db0a6b15fd03561568cdf23c
+  data.tar.gz: 284c940646692e1873590a4c549fd15b96632293ca103f3d4749cc46abc37aba
 SHA512:
-  metadata.gz: 8020a3d7422ccb240625435b24aad63a4487bf0e7bee1c4295f8cf45a7ebb3b807cad75fb3bfda43b9b70834a6b348ade7d1c311eebcddc9d7d09084a9996449
-  data.tar.gz: 65d30f1838998b50c8a89e916bc6d68fe8892ce7962984030fc6e53e723b590b953e959d4e2376c41912a98e84463923fb7e37f62790df8e62466b6446884440
+  metadata.gz: 20c95818e777b9a708cfdcd1f819c1b1accdf3b877d20e8e1eb063c735083751e7ec10c34bc1f74154566faac287986a9139976b5aaa674d86acd5b59011a080
+  data.tar.gz: 2a46d0373c0d1641cf62ff67d74fea96a25f2e4b7fe3008e5332e8dc92d4e18ac7d4bc4aa194e69abfecfc439e13aa71947026b1d0f0a31dd65ed75328b05dd4

data/lib/gettext_i18n_rails/action_controller.rb

@@ -10,10 +10,6 @@ path_controller = ->() {
     end
   end
 }
-if defined?(Rails) && Rails::VERSION::MAJOR >= 6
-  ActiveSupport.on_load(:action_controller_base) do
-    path_controller.call
-  end
-else
+ActiveSupport.on_load(:action_controller_base) do
   path_controller.call
-end
+end

data/lib/gettext_i18n_rails/active_model/name.rb

@@ -1,12 +1,12 @@
 module ActiveModel
   Name.class_eval do
     def human(options={})
-      human_name = @klass.humanize_class_name
+      msgid = @klass.gettext_model_name_msgid
 
       if count = options[:count]
-        n_(human_name, human_name.pluralize, count)
+        n_(msgid, msgid.pluralize, count)
       else
-        _(human_name)
+        _(msgid)
       end
     end
   end

data/lib/gettext_i18n_rails/active_model/translation.rb

@@ -8,7 +8,8 @@ module ActiveModel
     def gettext_translation_for_attribute_name(attribute)
       attribute = attribute.to_s
       if attribute.end_with?('_id')
-        humanize_class_name(attribute)
+        # foreign keys share the associated model's msgid (see #207)
+        gettext_resolve_legacy_msgid(attribute.sub(/_id\z/, '').camelize, humanize_class_name(attribute))
       else
         attribute_key = attribute.split('.').map! {|a| a.humanize }.join('|')
         root = inheritance_tree_root(self).to_s
@@ -40,5 +41,21 @@ module ActiveModel
       name ||= self.to_s
       name.underscore.humanize
     end
+
+    # Canonical msgid for a model name is the raw class name (see #207),
+    # e.g. "SomeNamespace::SomeModel" -- consistent with human_attribute_name.
+    def gettext_model_name_msgid
+      gettext_resolve_legacy_msgid(to_s, humanize_class_name)
+    end
+
+    # Returns +current+, unless only the legacy msgid resolves to a
+    # translation -- then +legacy+ is returned and a deprecation is warned
+    # once. Keeps pre-#207 .po files working during the transition.
+    def gettext_resolve_legacy_msgid(current, legacy)
+      return current if current == legacy || FastGettext.cached_find(current) || !FastGettext.cached_find(legacy)
+
+      GettextI18nRails.warn_legacy_model_msgid(legacy, current)
+      legacy
+    end
   end
 end

data/lib/gettext_i18n_rails/active_record.rb

@@ -9,6 +9,6 @@ class ActiveRecord::Base
 
   # method deprecated in Rails 3.1
   def self.human_name(*args)
-    _(self.humanize_class_name)
+    _(gettext_model_name_msgid)
   end
 end

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -1,5 +1,5 @@
 require 'rails/version'
-require 'rails' if Rails::VERSION::MAJOR > 2
+require 'rails'
 
 module GettextI18nRails
   #write all found models/columns to a file where GetTexts ruby parser can find them
@@ -9,12 +9,11 @@ module GettextI18nRails
       File.open(file,'w') do |f|
         f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
         ModelAttributesFinder.new.find(options).each do |model,column_names|
-          f.puts("_('#{model.humanize_class_name}')")
+          f.puts(gettext_extraction_call(model.to_s))
 
           #all columns namespaced under the model
           column_names.each do |attribute|
-            translation = model.gettext_translation_for_attribute_name(attribute)
-            f.puts("_('#{translation}')")
+            f.puts(gettext_extraction_call(model.gettext_translation_for_attribute_name(attribute)))
           end
         end
         f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
@@ -28,6 +27,18 @@ module GettextI18nRails
   end
   module_function :store_model_attributes
 
+  # Model-name msgids (no '|') are emitted as an n_() singular/plural pair, so the
+  # .po file carries msgid_plural for `model_name.human(count:)`. Attribute msgids
+  # (scoped with '|') have no plural form and stay singular. See issue #207.
+  def gettext_extraction_call(msgid)
+    if msgid.include?('|')
+      "_('#{msgid}')"
+    else
+      "n_('#{msgid}', '#{msgid.pluralize}')"
+    end
+  end
+  module_function :gettext_extraction_call
+
   class ModelAttributesFinder
     # options:
     #   :ignore_tables => ['cars',/_settings$/,...]
@@ -43,29 +54,15 @@ module GettextI18nRails
     end
 
     def initialize
-      connection = ::ActiveRecord::Base.connection
-      @existing_tables = (Rails::VERSION::MAJOR >= 5 ? connection.data_sources : connection.tables)
-    end
-
-    # Rails 7.0 has deprecated direct_descendants in favor of subclasses.
-    # It was removed completely in Rails 7.1.
-    # This will maintain backwards compatibility with Rails 3.0 - 6.1
-    def subclass_method
-      if Rails::VERSION::MAJOR < 7
-        :direct_descendants
-      else
-        :subclasses
-      end
+      @existing_tables = ::ActiveRecord::Base.connection.data_sources
     end
 
     # Rails < 3.0 doesn't have DescendantsTracker.
     # Instead of iterating over ObjectSpace (slow) the decision was made NOT to support
     # class hierarchies with abstract base classes in Rails 2.x
     def model_attributes(model, ignored_tables, ignored_cols)
-      return [] if model.abstract_class? && Rails::VERSION::MAJOR < 3
-
       if model.abstract_class?
-        model.send(subclass_method).reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
+        model.subclasses.reject {|m| ignored?(m.table_name, ignored_tables)}.inject([]) do |attrs, m|
           attrs.push(model_attributes(m, ignored_tables, ignored_cols)).flatten.uniq
         end
       elsif !ignored?(model.table_name, ignored_tables) && @existing_tables.include?(model.table_name)
@@ -76,25 +73,18 @@ module GettextI18nRails
     end
 
     def models
-      if Rails::VERSION::MAJOR >= 3
-        # Ensure autoloaders are set up before we attempt to eager load!
-        Rails.application.autoloaders.each(&:setup) if Rails.application.respond_to?(:autoloaders)
-        Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works
-        descendants = ::ActiveRecord::Base.send(subclass_method)
-
-        # In rails 5+ user models are supposed to inherit from ApplicationRecord
-        if defined?(::ApplicationRecord)
-          descendants += ApplicationRecord.send(subclass_method)
-          descendants.delete ApplicationRecord
-        end
+      # Ensure autoloaders are set up before we attempt to eager load!
+      Rails.application.autoloaders.each(&:setup) if Rails.application.respond_to?(:autoloaders)
+      Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works
+      descendants = ::ActiveRecord::Base.subclasses
+
+      # In rails 5+ user models are supposed to inherit from ApplicationRecord
+      if defined?(::ApplicationRecord)
+        descendants += ApplicationRecord.subclasses
+        descendants.delete ApplicationRecord
+      end
 
-        descendants
-      else
-        ::ActiveRecord::Base.connection.tables \
-          .map { |t| table_name_to_namespaced_model(t) } \
-          .compact \
-          .collect { |c| c.superclass.abstract_class? ? c.superclass : c }
-      end.uniq.sort_by(&:name)
+      descendants.uniq.sort_by(&:name)
     end
 
     def ignored?(name,patterns)

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '2.1.0'
+  Version = VERSION = '2.2.0'
 end

data/lib/gettext_i18n_rails.rb

@@ -3,6 +3,21 @@ require 'gettext_i18n_rails/gettext_hooks'
 
 module GettextI18nRails
   IGNORE_TABLES = [/^sitemap_/, /_versions$/, 'schema_migrations', 'sessions', 'delayed_jobs']
+
+  # Issue #207: model-name msgids changed from the humanized form
+  # ("Big car") to the raw class name ("BigCar"), matching attributes.
+  # The humanized form is still looked up as a fallback; warn once per
+  # msgid so apps can migrate their .po files.
+  def self.warn_legacy_model_msgid(legacy, current)
+    @warned_legacy_model_msgids ||= {}
+    return if @warned_legacy_model_msgids.key?(legacy)
+    @warned_legacy_model_msgids[legacy] = true
+    warn(
+      "[gettext_i18n_rails] msgid #{legacy.inspect} is deprecated, " \
+      "re-extract and translate #{current.inspect} instead " \
+      "(https://github.com/grosser/gettext_i18n_rails/issues/207)"
+    )
+  end
 end
 
 # translate from everywhere

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -44,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -140,17 +139,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
-description:
+        version: '0'
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -180,7 +178,6 @@ homepage: http://github.com/grosser/gettext_i18n_rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,15 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple FastGettext Rails integration.
 test_files: []