Don't pass nil to translation defaults.

Workaround for rails/rails#19419
projectblacklight · Mar 20, 2015 · d2d25d5 · cbeer · Mar 23, 2015 · jcoyne
1 parent 1ee725b
commit d2d25d5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/app/helpers/blacklight/configuration_helper_behavior.rb b/app/helpers/blacklight/configuration_helper_behavior.rb
@@ -87,13 +87,11 @@ def document_show_field_label document, field
   # Look up the label for the facet field
   def facet_field_label field
     field_config = blacklight_config.facet_fields[field]
+    defaults = [:"blacklight.search.fields.facet.#{field}", :"blacklight.search.fields.#{field}"]
+    defaults << field_config.label if field_config
+    defaults << field.to_s.humanize
 
-    field_label(
-      :"blacklight.search.fields.facet.#{field}",
-      :"blacklight.search.fields.#{field}",
-      (field_config.label if field_config),
-      field.to_s.humanize
-    )
+    field_label *defaults
   end
 
   def view_label view