MAGETWO-51908: [GITHUB] Price on product view page becomes 0,00 when locale is changed to persian (iran) #4077

 - updated per code review

Author: Mike Weis

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

@@ -411,10 +411,8 @@ public function saveRates($rates)
      */
     private function trimUnicodeDirectionMark($string)
     {
-        if (preg_match('/^\x{200E}/u', $string)) {
-            $string = preg_replace('/^\x{200E}/u', '', $string);
-        } elseif (preg_match('/^\x{200F}/u', $string)) {
-            $string = preg_replace('/^\x{200F}/u', '', $string);
+        if (preg_match('/^(\x{200E}|\x{200F})/u', $string, $match)) {
+            $string = preg_replace('/^'.$match[1].'/u', '', $string);
         }
         return $string;
     }

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

@@ -52,4 +52,49 @@ public function testGetCurrencySymbol()
             ->willReturn($currencyMock);
         $this->assertEquals($currencySymbol, $this->currency->getCurrencySymbol());
     }
+
+    /**
+     * @dataProvider getOutputFormatDataProvider
+     * @param $withCurrency
+     * @param $noCurrency
+     * @param $expected
+     */
+    public function testGetOutputFormat($withCurrency, $noCurrency, $expected)
+    {
+        $currencyMock = $this->getMockBuilder('\Magento\Framework\Currency')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock->expects($this->at(0))
+            ->method('toCurrency')
+            ->willReturn($withCurrency);
+        $currencyMock->expects($this->at(1))
+            ->method('toCurrency')
+            ->willReturn($noCurrency);
+        $this->localeCurrencyMock->expects($this->atLeastOnce())
+            ->method('getCurrency')
+            ->with($this->currencyCode)
+            ->willReturn($currencyMock);
+        $this->assertEquals($expected, $this->currency->getOutputFormat());
+    }
+
+    /**
+     * Return data sets for testGetCurrencySymbol()
+     *
+     * @return array
+     */
+    public function getOutputFormatDataProvider()
+    {
+        return [
+            'no_unicode' => [
+                'withCurrency' => '$0.00',
+                'noCurrency' => '0.00',
+                'expected' => '$%s',
+            ],
+            'arabic_unicode' => [
+                'withCurrency' => json_decode('"\u200E"') . '$0.00',
+                'noCurrency' => json_decode('"\u200E"') . '0.00',
+                'expected' => json_decode('"\u200E"') . '$%s',
+            ]
+        ];
+    }
 }

lib/internal/Magento/Framework/Locale/Format.php

@@ -9,7 +9,10 @@
 
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
-    const DEFAULT_NUMBER_SET = 'latn';
+    /**
+     * @var string
+     */
+    private static $defaultNumberSet = 'latn';
 
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
@@ -106,17 +109,17 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
             $currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
         }
         $localeData = (new DataBundle())->get($localeCode);
-        $defaultSet = $localeData['NumberElements']['default'] ?: self::DEFAULT_NUMBER_SET;
+        $defaultSet = $localeData['NumberElements']['default'] ?: self::$defaultNumberSet;
         $format = $localeData['NumberElements'][$defaultSet]['patterns']['currencyFormat']
-            ?: ($localeData['NumberElements'][self::DEFAULT_NUMBER_SET]['patterns']['currencyFormat']
+            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['patterns']['currencyFormat']
                 ?: explode(';', $localeData['NumberPatterns'][1])[0]);
 
         $decimalSymbol = $localeData['NumberElements'][$defaultSet]['symbols']['decimal']
-            ?: ($localeData['NumberElements'][self::DEFAULT_NUMBER_SET]['symbols']['decimal']
+            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['symbols']['decimal']
                 ?: $localeData['NumberElements'][0]);
 
         $groupSymbol = $localeData['NumberElements'][$defaultSet]['symbols']['group']
-            ?: ($localeData['NumberElements'][self::DEFAULT_NUMBER_SET]['symbols']['group']
+            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['symbols']['group']
                 ?: $localeData['NumberElements'][1]);
 
         $pos = strpos($format, ';');