Merge pull request #3794 from m-budryte/replace_&_with_OR

& replaced by OR when multiple property filters are selected

app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee

@@ -45,12 +45,12 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord
   $scope.appliedTaxonsList = ->
     $scope.activeTaxons.map( (taxon_id) ->
       Taxons.taxons_by_id[taxon_id].name
-    ).join(" & ") if $scope.activeTaxons?
+    ).join(" #{t('products_or')} ") if $scope.activeTaxons?
 
   $scope.appliedPropertiesList = ->
     $scope.activeProperties.map( (property_id) ->
       Properties.properties_by_id[property_id].name
-    ).join(" & ") if $scope.activeProperties?
+    ).join(" #{t('products_or')} ") if $scope.activeProperties?
 
   $scope.clearAll = ->
     $scope.query = ""

config/locales/en.yml

@@ -1563,6 +1563,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
 
   products_clear_all: Clear all
   products_showing: "Showing:"
+  products_or: "OR"
   products_with: with
   products_search: "Search by product or producer"
   products_loading: "Loading products..."