Merge pull request #11625 from lerni/thousand-separator-de_CH

FIX thousand separator de_CH

Author: GuySartorelli

src/Forms/NumericField.php

@@ -101,24 +101,14 @@ protected function getNumberType()
         return NumberFormatter::TYPE_DOUBLE;
     }
 
-    /**
-     * In some cases and locales, validation expects non-breaking spaces.
-     * This homogenises regular, narrow and thin non-breaking spaces to a regular space character.
-     *
-     */
-    private function clean(?string $value): string
-    {
-        return trim(str_replace(["\u{00A0}", "\u{202F}", "\u{2009}"], ' ', $value ?? ''));
-    }
 
     public function setSubmittedValue($value, $data = null)
     {
         // Save original value in case parse fails
-        $value = $this->clean($value);
         $this->originalValue = $value;
 
         // Empty string is no-number (not 0)
-        if (strlen($value ?? '') === 0) {
+        if (mb_strlen($value ?? '') === 0) {
             $this->value = null;
             return $this;
         }
@@ -128,7 +118,7 @@ public function setSubmittedValue($value, $data = null)
         $parsed = 0;
         $this->value = $formatter->parse($value, $this->getNumberType(), $parsed); // Note: may store literal `false` for invalid values
         // Ensure that entire string is parsed
-        if ($parsed < strlen($value ?? '')) {
+        if ($parsed < mb_strlen($value ?? '')) {
             $this->value = false;
         }
         return $this;
@@ -164,7 +154,7 @@ public function setValue($value, $data = null)
      */
     protected function cast($value)
     {
-        if (strlen($value ?? '') === 0) {
+        if (mb_strlen($value ?? '') === 0) {
             return null;
         }
         if ($this->getScale() === 0) {

tests/php/Forms/NumericFieldTest.php

@@ -64,6 +64,12 @@ public function dataForTestSetValue()
             ['de_DE', null, '12.0', '12,0'],
             ['de_DE', null, '12.1', '12,1'],
             ['de_DE', 1, '14000.5', "14.000,5"],
+            // de_CH
+            ['de_CH', 0, '13000', "13’000"],
+            ['de_CH', 0, '15', '15'],
+            ['de_CH', null, '12.0', '12.0'],
+            ['de_CH', null, '12.1', '12.1'],
+            ['de_CH', 1, '14000.5', "14’000.5"],
             // nl
             ['nl_NL', 0, '13000', "13.000"],
             ['nl_NL', 0, '15', '15'],
@@ -137,7 +143,17 @@ public function dataForTestSubmittedValue()
             ['de_DE', 1, '15 000.5', false],
             ['de_DE', 1, '15.000,5', 15000.5],
             ['de_DE', 1, '15,000.5', false],
-
+            // de_CH (Swiss German)
+            ['de_CH', 0, '13000', 13000, '13’000'],
+            ['de_CH', 2, '12,00', false],
+            ['de_CH', 2, '12.00', 12.00],
+            ['de_CH', 1, '11 000', 11000, "11’000.0"],
+            ['de_CH', 0, "11.000", 11, "11"],
+            ['de_CH', null, '11,000', 11000.0, '11’000.0'],
+            ['de_CH', 1, '15 000,5', false],
+            ['de_CH', 1, "15 000.5", 15000.5, '15’000.5'],
+            ['de_CH', 1, '15.000,5', false],
+            ['de_CH', 1, '15,000.5', 15000.5, '15’000.5'],
             // nl_nl (same as de)
             ['nl_NL', 0, '13000', 13000, '13.000'],
             ['nl_NL', 2, '12,00', 12.00],