Merge branch 'master' into 202001.0-release

spryker-shop · Jan 15, 2020 · 6b16d72 · 6b16d72
2 parents 9ce8f31 + ad45af0
commit 6b16d72
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/data/import/glossary.csv b/data/import/glossary.csv
@@ -2316,6 +2316,8 @@ mail.giftCard.delivery.text,"Sehr geehrter Kunde, vielen Dank für den Kauf eine
 mail.giftCard.delivery.text,"Dear customer, thank you for buying a gift card at our shop. Your gift card code is: ",en_US
 mail.giftCard.usage.subject,Thank you for using a Gift Card!,en_US
 mail.giftCard.usage.subject,Vielen Dank dass Sie ein Geschenkgutschein benutzt haben.,de_DE
+cart.code.apply.failed,Code could not be applied,en_US
+cart.code.apply.failed,Gutscheincode konnte nicht angewendet werden,de_DE
 cart.code.enter-code,Gutscheincode/Geschenkgutscheincode eingeben,de_DE
 cart.code.enter-code,Enter voucher/gift card code,en_US
 general.next.button,Next,en_US

diff --git a/.../Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig b/.../Yves/CatalogPage/Theme/default/components/molecules/filter-category/filter-category.twig
@@ -20,7 +20,7 @@
             {% endfor %}
 
             {% set currentUrl = data.filterPath is not empty ? url(data.filterPath, {categoryPath: (categoryPath)}) : categoryPath %}
-            {% set categoryUrl = data.filterPath is not empty ? url(data.filterPath, {categoryPath: (categoryNode.url)}) : categoryNode.url %}
+            {% set categoryUrl = data.filterPath is not empty ? url(data.filterPath, {categoryPath: (categoryNode.url | trimLocale)}) : categoryNode.url %}
             {% set isActive = currentUrl == categoryUrl %}
             {% set disableAttribute = quantity == 0 ? 'disabled' %}
             {% set classes = [

diff --git a/...Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig b/...Pyz/Yves/CatalogPage/Theme/default/templates/page-layout-catalog/page-layout-catalog.twig
@@ -178,7 +178,7 @@
             {% macro renderBreadcrumbSteps(categoryNode, isLastLeaf, filterPath) %}
                 {% import _self as self %}
                 {% set categoryUrl = categoryNode.url | default %}
-                {% set categoryUrl = filterPath is not empty ? url(filterPath, {categoryPath: categoryUrl}) : categoryUrl %}
+                {% set categoryUrl = filterPath is not empty ? url(filterPath, {categoryPath: categoryUrl | trimLocale}) : categoryUrl %}
                 {% set categoryLabel = categoryNode.name | default %}
                 {% set categoryPatrentNodes = categoryNode.parents | default(null) %}