From dee793a392fb0572df4829426ed02a49566299b6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 2 May 2020 12:19:50 +0200
Subject: [PATCH] Change join word between the two filter sets to be "and", to
 match the actual logic

---
 app/views/shop/products/_applied_filters_feedback.haml | 2 +-
 config/locales/en.yml                                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/shop/products/_applied_filters_feedback.haml b/app/views/shop/products/_applied_filters_feedback.haml
index b92ff8f088..45730f39cf 100644
--- a/app/views/shop/products/_applied_filters_feedback.haml
+++ b/app/views/shop/products/_applied_filters_feedback.haml
@@ -4,6 +4,6 @@
 %span.applied-properties{'ng-bind-html' => 'appliedPropertiesList()'}
 
 %span{ "ng-show" => "appliedPropertiesList() && appliedTaxonsList()" }
-  = t :products_or
+  = t :products_and
 
 %span.applied-taxons{'ng-bind-html' => 'appliedTaxonsList()'}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62654fc6da..01ba7cebd2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1652,6 +1652,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   products_showing: "Showing:"
   products_results_for: "Results for"
   products_or: "or"
+  products_and: "and"
   products_filters_in: "in"
   products_with: with
   products_search: "Search..."