validation_hints 8.1.56 → 8.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9130f003f73cf1353979306ee5b8f691c39556db3cd3fc07132006320bbb5ab7
-  data.tar.gz: c495d03625d531fefe0de1c45dfd4dc70bbfbdfeb8ece9e57c6fe02d57832ffc
+  metadata.gz: 64dcc61de84085cc1b5d5e13e9fdfbdac7b02b482608ee47f5c6ce3db52245c5
+  data.tar.gz: e4bf9918525ed479b863827fa9499a4fc0691d6c25e2b9ef225686b68ecba6f3
 SHA512:
-  metadata.gz: 1043e8935871135a27af28ca8b35f3525bb105d6b18048c277457faff15aa1ef72ac1d6af2e50e1f4a7001a8667bb54ea2170f8bc1635e19e84c22df81c7a9d7
-  data.tar.gz: 2121095b4511eed8c0ba0e49b989d6d4226a56904627422c1f5e529d910b2706169ac42ec54ae5160be1bda214d8c58b1465f84d509bd46206c689d22bf0f9e9
+  metadata.gz: c77ee68dc7eb5e216d60dacba2683994d5004df3a5ab7fb60326d4b412709fe52bf6a2bacc49ada6bad8c6930d2dbadbb78a32729347819f74f56ef824fbab25
+  data.tar.gz: f98d5e7fa38b3afbeabd7f8411fde3254094d6fbbb2e875d128ee41d47f2246bad47a9a231ca8697cc87a1e4146e144c87503a14cd92b80ad34b2faf69ea086c

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project are documented here.
 
+## 8.1.57
+
+### Added
+
+- **Dutch locale.** `lib/validation_hints/locale/nl.yml` has the same keys as `en.yml`, with the translations from StProject's `config/locales/validation_hints.nl.yml`. Every shipped locale file is loaded (`ValidationHints::LOCALE_PATHS`; `LOCALE_PATH` still names the en file), and a host's own locale files still win.
+
+### Fixed
+
+- **`message: :required` hints were "Translation missing", even in en.** Every `belongs_to` (Rails adds `validates_presence_of …, message: :required`) is hinted as `presence.required`. The en file had `presence` only as a plain string, so that key could never exist. Like Rails' `errors.messages.required`, the lookup now falls back to `hints.messages.required` (and the `activerecord` / `activemodel` scopes) after the `presence.required` keys. en gets "must be chosen", nl "moet gekozen zijn". `presence` itself stays a plain string, so a host's `hints.messages.presence` override keeps working, and a host's `presence.required` key (StProject's nl file) still wins.
+
+### Tests
+
+- `test/active_model/i18n_test.rb`:
+  - a `message: :required` presence hint resolves in en, and a `presence.required` key wins over the fallback;
+  - nl hints and full messages render;
+  - every shipped locale has exactly the keys of en.
+
+### Changed
+
+- **Version numbering:** aligned with **inline_forms** / **inline_forms_installer** / **inline_forms_schema_edit** **8.1.57**. The companion release has security fixes and translations in inline_forms.
+
 ## 8.1.56
 
 ### Changed

data/lib/active_model/hints.rb

@@ -218,6 +218,11 @@ module ActiveModel
         message_key = "#{key}.#{options[:message]}"
         generate_options = options.dup
         generate_options.delete(:message)
+        # Like Rails' errors.messages.required: `message: :required` (every
+        # belongs_to) also finds hints.messages.required when no
+        # "presence.required" key exists. `presence` itself stays a plain
+        # string, so overriding hints.messages.presence keeps working.
+        generate_options[:fallback_type] = options[:message]
         result << generate_message(attribute, message_key, generate_options)
         return result
       end
@@ -309,6 +314,11 @@ module ActiveModel
       defaults << :"activemodel.hints.messages.#{type}"
       defaults << :"hints.attributes.#{attribute_name}.#{type}"
       defaults << :"hints.messages.#{type}"
+      if (fallback = options[:fallback_type])
+        defaults << :"#{@base.class.i18n_scope}.hints.messages.#{fallback}" if @base.class.respond_to?(:i18n_scope)
+        defaults << :"activemodel.hints.messages.#{fallback}"
+        defaults << :"hints.messages.#{fallback}"
+      end
       defaults.compact.flatten
     end
 

data/lib/validation_hints/locale/en.yml

@@ -26,6 +26,9 @@ en:
       confirmation: "doesn't match confirmation"
       acceptance: "must be accepted"
       presence: "can't be blank"
+      # `message: :required` (belongs_to): looked up as presence.required,
+      # then as required (see ActiveModel::Hints#i18n_defaults).
+      required: "must be chosen"
       money: "must be a valid amount"
       length:
         maximum: "must not be longer than %{count} characters"

data/lib/validation_hints/locale/nl.yml

@@ -0,0 +1,50 @@
+---
+# Dutch, key for key the same as en.yml. Translations from StProject's
+# config/locales/validation_hints.nl.yml (which keeps working next to this
+# file; a host's own locale files load later and win).
+nl:
+  activemodel:
+    hints:
+      format: "%{attribute} %{message}"
+
+  activerecord:
+    hints:
+      format: "%{attribute} %{message}"
+
+  hints:
+    format: "%{attribute} %{message}"
+
+    messages:
+      invalid: "is ongeldig"
+      blank: "moet ingevuld zijn"
+      empty: "moet ingevuld zijn"
+      inclusion:
+        in: "moet een van %{count} zijn"
+      exclusion:
+        in: "mag niet een van %{count} zijn"
+      format: "moet het vereiste formaat hebben"
+      email_format: "moet een geldig e-mailadres zijn"
+      associated: "is ongeldig"
+      uniqueness: "moet uniek zijn"
+      confirmation: "moet overeenkomen met de bevestiging"
+      acceptance: "moet geaccepteerd worden"
+      presence: "moet ingevuld zijn"
+      # `message: :required` (belongs_to): looked up as presence.required,
+      # then as required (see ActiveModel::Hints#i18n_defaults).
+      required: "moet gekozen zijn"
+      money: "moet een geldig bedrag zijn"
+      length:
+        maximum: "mag niet langer zijn dan %{count} tekens"
+        minimum: "mag niet korter zijn dan %{count} tekens"
+        is: "moet precies %{count} tekens lang zijn"
+        within: "moet tussen %{minimum} en %{maximum} tekens lang zijn"
+      numericality:
+        must_be_a_number: "moet een getal zijn"
+        only_integer: "moet een geheel getal zijn"
+        greater_than: "moet groter zijn dan %{count}"
+        greater_than_or_equal_to: "moet groter dan of gelijk aan %{count} zijn"
+        equal_to: "moet gelijk zijn aan %{count}"
+        less_than: "moet kleiner zijn dan %{count}"
+        less_than_or_equal_to: "moet kleiner dan of gelijk aan %{count} zijn"
+        odd: "moet oneven zijn"
+        even: "moet even zijn"

data/lib/validation_hints/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module ValidationHints
-  VERSION = "8.1.56"
+  VERSION = "8.1.57"
 end

data/lib/validation_hints.rb

@@ -5,12 +5,14 @@ require "active_model/hints"
 
 module ValidationHints
   LOCALE_PATH = File.expand_path("validation_hints/locale/en.yml", __dir__)
+  # Every shipped locale (en, nl). A host's own files load later and win.
+  LOCALE_PATHS = Dir[File.expand_path("validation_hints/locale/*.yml", __dir__)].sort.freeze
 
   def self.load_i18n!
     return if @i18n_loaded
 
     require "i18n"
-    I18n.load_path << LOCALE_PATH unless I18n.load_path.include?(LOCALE_PATH)
+    LOCALE_PATHS.each { |path| I18n.load_path << path unless I18n.load_path.include?(path) }
     @i18n_loaded = true
   end
 end

data/test/active_model/i18n_test.rb

@@ -2,6 +2,14 @@
 
 require "test_helper"
 
+# `message: :required` is what every belongs_to declares (Rails adds
+# validates_presence_of <assoc>, message: :required).
+class RequiredCodePerson < ActiveRecord::Base
+  self.table_name = "people"
+
+  validates :code, presence: { message: :required }
+end
+
 class ActiveModelHintsI18nTest < Minitest::Test
   def setup
     @person = Person.new
@@ -51,6 +59,38 @@ class ActiveModelHintsI18nTest < Minitest::Test
     assert_includes @person.hints[:name], "fill this in"
   end
 
+  # The en file had only a plain `presence` string, so "presence.required"
+  # (every belongs_to hint) rendered "Translation missing" even in en.
+  def test_required_message_resolves_in_en
+    assert_equal [ "must be chosen" ], RequiredCodePerson.new.hints[:code]
+  end
+
+  def test_required_message_prefers_a_presence_required_key
+    @kv.store_translations(:en, hints: { messages: { presence: { required: "pick one" } } })
+
+    assert_equal [ "pick one" ], RequiredCodePerson.new.hints[:code]
+  end
+
+  def test_nl_ships_with_the_gem
+    I18n.with_locale(:nl) do
+      assert_includes @person.hints[:name], "moet ingevuld zijn"
+      assert_equal [ "moet gekozen zijn" ], RequiredCodePerson.new.hints[:code]
+      assert_equal [ "Name moet ingevuld zijn" ], @person.hints.full_messages_for(:name)
+    end
+  end
+
+  def test_every_shipped_locale_has_the_keys_of_en
+    flatten = lambda do |hash, prefix = nil|
+      hash.flat_map { |key, value| value.is_a?(Hash) ? flatten.call(value, [ prefix, key ].compact.join(".")) : [ [ prefix, key ].compact.join(".") ] }
+    end
+    en_keys = flatten.call(YAML.load_file(ValidationHints::LOCALE_PATH)["en"]).sort
+    assert_operator ValidationHints::LOCALE_PATHS.size, :>=, 2
+    ValidationHints::LOCALE_PATHS.each do |path|
+      locale, translations = YAML.load_file(path).first
+      assert_equal en_keys, flatten.call(translations).sort, "#{locale} (#{File.basename(path)})"
+    end
+  end
+
   def test_full_message_uses_activerecord_human_attribute_name
     @kv.store_translations(:en, activerecord: { attributes: { person: { name: "Your name" } } })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_hints
 version: !ruby/object:Gem::Version
-  version: 8.1.56
+  version: 8.1.57
 platform: ruby
 authors:
 - Ace Suares
@@ -161,6 +161,7 @@ files:
 - lib/validation_hints.rb
 - lib/validation_hints/gem_build.rb
 - lib/validation_hints/locale/en.yml
+- lib/validation_hints/locale/nl.yml
 - lib/validation_hints/railtie.rb
 - lib/validation_hints/validations_patch.rb
 - lib/validation_hints/version.rb