Merge pull request #5440 from bbuckingham/issue-11565

fixes #11565 - content view filter - fix formatting on error messages
Katello · Aug 26, 2015 · f25fe19 · f25fe19
2 parents c0d6834 + 90d359d
commit f25fe19
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/models/katello/content_view_filter.rb b/app/models/katello/content_view_filter.rb
@@ -63,8 +63,8 @@ def self.class_for(content_type)
       when ERRATA
         ContentViewErratumFilter
       else
-        params = { :content_type => content_type, :content_types => CONTENT_TYPES.join(", ") }
-        fail _("Invalid content type '%{ content_type }' provided. Content types can be one of %{ content_types }") % params
+        fail _("Invalid content type '%{content_type}' provided. Content types can be one of %{content_types}") %
+                 { :content_type => content_type, :content_types => CONTENT_TYPES.join(", ") }
       end
     end
 
@@ -77,8 +77,8 @@ def self.rule_class_for(filter)
       when ContentViewErratumFilter.name
         ContentViewErratumFilterRule
       else
-        params = { :content_type => filter.type, :content_types => CONTENT_TYPES.join(", ") }
-        fail _("Invalid content type '%{ content_type }' provided. Content types can be one of %{ content_types }") % params
+        fail _("Invalid content type '%{content_type}' provided. Content types can be one of %{content_types}") %
+                 { :content_type => filter.type, :content_types => CONTENT_TYPES.join(", ") }
       end
     end
 
@@ -91,8 +91,8 @@ def self.rule_ids_for(filter)
       when ContentViewErratumFilter.name
         filter.erratum_rule_ids
       else
-        params = { :content_type => filter.type, :content_types => CONTENT_TYPES.join(", ") }
-        fail _("Invalid content type '%{ content_type }' provided. Content types can be one of %{ content_types }") % params
+        fail _("Invalid content type '%{content_type}' provided. Content types can be one of %{content_types}") %
+                 { :content_type => filter.type, :content_types => CONTENT_TYPES.join(", ") }
       end
     end