Merge pull request #7423 from magento-l3/ACP2E-457

ACP2E-457: Arabic (Saudi Arabia) locale breaks the product detail page

Author: sidolov

app/code/Magento/Directory/Model/Currency.php

@@ -28,11 +28,11 @@ class Currency extends \Magento\Framework\Model\AbstractModel
     /**
      * CONFIG path constants
      */
-    const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';
+    public const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';
 
-    const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';
+    public const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';
 
-    const XML_PATH_CURRENCY_BASE = 'currency/options/base';
+    public const XML_PATH_CURRENCY_BASE = 'currency/options/base';
 
     /**
      * @var Filter
@@ -439,7 +439,13 @@ private function formatCurrency(string $price, array $options): string
 
         if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
                 && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
-            $formattedCurrency = preg_replace(['/[^0-9.,۰٫]+/', '/ /'], '', $formattedCurrency);
+            if ($this->isArabicSymbols($formattedCurrency)) {
+                /* Workaround. We need to provide Arabic symbols range and Unicode modifier into expression
+                   to bypass issue when preg_replace with Arabic symbol return corrupted result */
+                $formattedCurrency = preg_replace(['/[^0-9\x{0600}-\x{06FF}.,۰٫]+/u', '/ /'], '', $formattedCurrency);
+            } else {
+                $formattedCurrency = preg_replace(['/[^0-9.,۰٫]+/', '/ /'], '', $formattedCurrency);
+            }
         }
 
         return preg_replace('/^\s+|\s+$/u', '', $formattedCurrency);
@@ -597,4 +603,15 @@ private function trimUnicodeDirectionMark($string)
         }
         return $string;
     }
+
+    /**
+     * Checks if given string is of Arabic symbols
+     *
+     * @param string $string
+     * @return bool
+     */
+    private function isArabicSymbols(string $string): bool
+    {
+        return preg_match('/[\p{Arabic}]/u', $string) > 0;
+    }
 }

app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php

@@ -23,6 +23,10 @@ class CurrencyTest extends TestCase
      */
     protected $currency;
 
+    /**
+     * @var string
+     */
+
     protected $currencyCode = 'USD';
 
     /**
@@ -128,10 +132,18 @@ public function getOutputFormatDataProvider(): array
                 'expected' => '$%s',
                 'locale' => 'en_US'
             ],
-            'arabic_unicode' => [
+            'arabic_ar_SA' => [
+                'expected' =>  '%s' . json_decode('"\u00A0"') . 'US$',
+                'locale' => 'ar_SA'
+            ],
+            'arabic_fa_IR' => [
                 'expected' => json_decode('"\u200E"') . '$%s',
                 'locale' => 'fa_IR'
-            ]
+            ],
+            'arabic_ar_KW' => [
+                'expected' => '%s' . json_decode('"\u00A0"') . 'US$',
+                'locale' => 'ar_KW'
+            ],
         ];
     }