MAGETWO-99152: Special Prices cannot save over 4 characters in Japanese Yen - The comma separator seems to be the issue

Author: serhii-balko

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

@@ -25,6 +25,11 @@ class Format implements \Magento\Framework\Locale\FormatInterface
      */
     protected $currencyFactory;
 
+    /**
+     * @var array
+     */
+    private $groupSeparatorByLocale = [];
+
     /**
      * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param ResolverInterface $localeResolver
@@ -81,7 +86,13 @@ public function getNumber($value)
                 $value = str_replace(',', '', $value);
             }
         } elseif ($separatorComa !== false) {
-            $value = str_replace(',', '.', $value);
+            $locale = $this->_localeResolver->getLocale();
+            $groupSeparator = $this->retrieveLocaleGroupSeparator($locale);
+            if ($groupSeparator === ',') {
+                $value = str_replace(',', '', $value);
+            } else {
+                $value = str_replace(',', '.', $value);
+            }
         }
 
         return (float)$value;
@@ -149,4 +160,22 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
 
         return $result;
     }
+
+    /**
+     * Retrieve group separator symbol by locale
+     *
+     * @param $locale string
+     * @return string
+     */
+    private function retrieveLocaleGroupSeparator(string $locale): string
+    {
+        if (!array_key_exists($locale, $this->groupSeparatorByLocale)) {
+            $formatter = new \NumberFormatter($locale, \NumberFormatter::DECIMAL);
+            $this->groupSeparatorByLocale[$locale] = $formatter->getSymbol(
+                \NumberFormatter::GROUPING_SEPARATOR_SYMBOL
+            );
+        }
+
+        return $this->groupSeparatorByLocale[$locale];
+    }
 }

lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php

@@ -103,10 +103,14 @@ public function getPriceFormatDataProvider(): array
      *
      * @param mixed $value
      * @param float $expected
+     * @param string $locale
      * @dataProvider provideNumbers
      */
-    public function testGetNumber($value, $expected): void
+    public function testGetNumber(string $value, float $expected, string $locale = null): void
     {
+        if ($locale !== null) {
+            $this->localeResolver->method('getLocale')->willReturn($locale);
+        }
         $this->assertEquals($expected, $this->formatModel->getNumber($value));
     }
 
@@ -122,11 +126,15 @@ public function provideNumbers(): array
             ['12343', 12343],
             ['-9456km', -9456],
             ['0', 0],
-            ['2 054,10', 2054.1],
-            ['2046,45', 2046.45],
+            ['2 054,10', 205410, 'en_US'],
+            ['2 054,10', 2054.1, 'de_DE'],
+            ['2046,45', 204645, 'en_US'],
+            ['2046,45', 2046.45, 'de_DE'],
             ['2 054.52', 2054.52],
-            ['2,46 GB', 2.46],
+            ['2,46 GB', 246, 'en_US'],
+            ['2,46 GB', 2.46, 'de_DE'],
             ['2,054.00', 2054],
+            ['2,000', 2000, 'ja_JP'],
         ];
     }
 }