From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Jul 2023 14:01:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/4076'
X-Git-Tag: live~1706
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/817cd6995fc37de26acf717e0fd7ffb47fbfc44a?hp=72c567d73b11de39354df2365a63f26bf8de0a02

Merge remote-tracking branch 'upstream/pull/4076'
---

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 3f46955b3..ab7cc4dc2 100644
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -55,10 +55,13 @@ class I18nTest < ActiveSupport::TestCase
     end
   end
 
-  def test_en_for_raw_html
-    en = YAML.load_file(Rails.root.join("config/locales/en.yml"))
-    assert_nothing_raised do
-      check_values_for_raw_html(en)
+  Rails.root.glob("config/locales/*.yml").each do |filename|
+    lang = File.basename(filename, ".yml")
+    define_method("test_#{lang}_for_raw_html".to_sym) do
+      yml = YAML.load_file(filename)
+      assert_nothing_raised do
+        check_values_for_raw_html(yml)
+      end
     end
   end
 
@@ -101,7 +104,7 @@ class I18nTest < ActiveSupport::TestCase
       if v.is_a? Hash
         check_values_for_raw_html(v)
       else
-        next unless k.end_with?("_html")
+        next unless k.to_s.end_with?("_html")
         raise "Avoid using raw html in '#{k}: #{v}'" if v.include? "<"
       end
     end