diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee index c42c31bd65..0de9cedbf8 100644 --- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee +++ b/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(" OR ") if $scope.activeProperties? + ).join(t('products_or')) if $scope.activeProperties? $scope.clearAll = -> $scope.query = "" diff --git a/config/locales/en.yml b/config/locales/en.yml index a6609f2f5a..c18fb36438 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1573,6 +1573,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..."