[shopsys] ported fixes from release 13.0.0 (#2873)

app/check-composer-json.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ -h "composer.json" ]; then
+    echo 'Please run composer install in the app/ subfolder.'
+    exit 1
+fi

app/composer.json

@@ -146,6 +146,12 @@
         "guzzlehttp/psr7": "<=1.8.3, >=2.0.0, <=2.1.0"
     },
     "scripts": {
+        "pre-install-cmd": [
+            "./check-composer-json.sh"
+        ],
+        "pre-update-cmd": [
+            "./check-composer-json.sh"
+        ],
         "post-install-cmd": [
             "App\\Environment::checkEnvironment",
             "@auto-scripts"

check-composer-json.sh

@@ -0,0 +1 @@
+app/check-composer-json.sh

composer.json

@@ -0,0 +1 @@
+app/composer.json

storefront/components/Blocks/Product/ButtonsAction/ProductCompareButton.tsx

@@ -26,7 +26,7 @@ export const ProductCompareButton: FC<ProductCompareButtonProps> = ({
             onClick={toggleProductInComparison}
         >
             <CompareIcon className={twMergeCustom('text-grey', isProductInComparison && 'text-green')} />
-            {isWithText && <span>{t(isProductInComparison ? 'Remove from comparison' : 'Compare')}</span>}
+            {isWithText && <span>{isProductInComparison ? t('Remove from comparison') : t('Compare')}</span>}
         </div>
     );
 };

storefront/public/locales/cs/common.json

@@ -48,6 +48,7 @@
     "Company name must be at most {{ max }} characters": "Nazev firmy nesmí být delší než {{ max }} znaků",
     "Company number": "IČO",
     "Company tax number must be at most {{ max }} characters": "DIČ nesmí být delší než {{ max }} znaků",
+    "Compare": "Porovnat",
     "Compared product is already compared.": "Porovnávaný produkt je již v porovnání.",
     "Compared product not found.": "Porovnávaný produkt nebyl nalezen.",
     "Comparison": "Porovnání",
@@ -288,6 +289,7 @@
     "Reject all": "Odmítnout vše",
     "relevance": "Relevance",
     "Remove from cart": "Odstranit z košíku",
+    "Remove from comparison": "Obebrat z porovnání",
     "Remove from wishlist": "Odebrat z oblíbených produktů",
     "Remove product from comparison": "Smaž produkt z porovnání",
     "Remove product from wishlist": "Odebrat produkt z oblíbených produktů",
@@ -315,7 +317,7 @@
     "Sign up": "Zaregistrovat",
     "Sign up for our newsletter and get 35% discount on running apparel": "Zaregistrujte se k odběru newsletteru a získejte slevu 35% na běžecké vybavení",
     "Slovakia": "Slovensko",
-    "Some product was removed from e-shop and your cart was recalculated.": "",
+    "Some product was removed from e-shop and your cart was recalculated.": "Některé produkty byly z e-shopu odstraněny a váš košík byl přepočítán.",
     "Some products could not have been added to your cart": "Některé produkty se nepodařilo vložit do vašeho košíku",
     "Something went wrong.": "Něco se nepovedlo.",
     "Something wrong happened... Page not found": "Něco se nepovedlo... Stránka nenalezena",

storefront/public/locales/en/common.json

@@ -48,6 +48,7 @@
     "Company name must be at most {{ max }} characters": "Company name must be at most {{ max }} characters",
     "Company number": "Company number",
     "Company tax number must be at most {{ max }} characters": "Company tax number must be at most {{ max }} characters",
+    "Compare": "Compare",
     "Compared product is already compared.": "Compared product is already compared.",
     "Compared product not found.": "Compared product not found.",
     "Comparison": "Comparison",
@@ -67,7 +68,7 @@
     "Could not connect to server. Check your network.": "Could not connect to server. Check your network.",
     "Could not create account": "Could not create account",
     "Could not create order": "Could not create order",
-    "Could not find any results for the given query.": "Pro tento výraz jsme bohužel nenašli žádné výsledky.",
+    "Could not find any results for the given query.": "Could not find any results for the given query.",
     "Could not prefill your cart": "Could not prefill your cart",
     "Could not reset password": "Could not reset password",
     "Could not sent personal data export request": "Could not sent personal data export request",
@@ -274,6 +275,7 @@
     "Reject all": "Reject all",
     "relevance": "Relevance",
     "Remove from cart": "Remove from cart",
+    "Remove from comparison": "Remove from comparison",
     "Remove from wishlist": "Remove from wishlist",
     "Remove product from comparison": "Remove product from comparison",
     "Remove product from wishlist": "Remove product from wishlist",

storefront/public/locales/sk/common.json

@@ -48,6 +48,7 @@
     "Company name must be at most {{ max }} characters": "",
     "Company number": "IČO",
     "Company tax number must be at most {{ max }} characters": "",
+    "Compare": "",
     "Compared product is already compared.": "",
     "Compared product not found.": "",
     "Comparison": "",
@@ -288,6 +289,7 @@
     "Reject all": "Reject all",
     "relevance": "Relevantnosť",
     "Remove from cart": "Odstrániť z košíka",
+    "Remove from comparison": "",
     "Remove from wishlist": "Odobrať z obľúbených produktov",
     "Remove product from comparison": "",
     "Remove product from wishlist": "Odobrať produkt z obľúbených produktov",