From 0fb2d1a0ba3360e928a7ac9d20378d7f5fbf915f Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Wed, 28 Oct 2015 21:52:33 +0100
Subject: Ignore scope in missing translation input.

It's already represented in the key name. Demonstrate with a test.

Also test that the default isn't output.
---
 actionview/lib/action_view/helpers/translation_helper.rb | 2 +-
 actionview/test/template/translation_helper_test.rb      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'actionview')

diff --git a/actionview/lib/action_view/helpers/translation_helper.rb b/actionview/lib/action_view/helpers/translation_helper.rb
index dde1ef22ac..4c4d2c4457 100644
--- a/actionview/lib/action_view/helpers/translation_helper.rb
+++ b/actionview/lib/action_view/helpers/translation_helper.rb
@@ -90,7 +90,7 @@ module ActionView
           keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
           title = "translation missing: #{keys.join('.')}"
 
-          interpolations = options.except(:default)
+          interpolations = options.except(:default, :scope)
           if interpolations.any?
             title << ", " << interpolations.map { |k, v| "#{k}: #{ERB::Util.html_escape(v)}" }.join(', ')
           end
diff --git a/actionview/test/template/translation_helper_test.rb b/actionview/test/template/translation_helper_test.rb
index 261576bead..631bceadd8 100644
--- a/actionview/test/template/translation_helper_test.rb
+++ b/actionview/test/template/translation_helper_test.rb
@@ -66,6 +66,14 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert translate(:"translations.missing").html_safe?
   end
 
+  def test_returns_missing_translation_message_does_filters_out_i18n_options
+    expected = '<span class="translation_missing" title="translation missing: en.translations.missing, year: 2015">Missing</span>'
+    assert_equal expected, translate(:"translations.missing", year: '2015', default: [])
+
+    expected = '<span class="translation_missing" title="translation missing: en.scoped.translations.missing, year: 2015">Missing</span>'
+    assert_equal expected, translate(:"translations.missing", year: '2015', scope: %i(scoped))
+  end
+
   def test_raises_missing_translation_message_with_raise_config_option
     ActionView::Base.raise_on_missing_translations = true
 
-- 
cgit v1.2.3