Skip to content

Commit b80de02

Browse files
authored
ENGCOM-5153: Properly transliterate German Umlauts #22989
2 parents 82b6272 + e0d0f19 commit b80de02

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Filter\Test\Unit;
77

8+
/**
9+
* Translit test.
10+
*/
811
class TranslitTest extends \PHPUnit\Framework\TestCase
912
{
1013
/**
@@ -45,8 +48,8 @@ public function filterDataProvider()
4548
['привет мир', 'privet mir', 'privet mir', $isIconv],
4649
[
4750
'Weiß, Goldmann, Göbel, Weiss, Göthe, Goethe und Götz',
48-
'Weiss, Goldmann, Gobel, Weiss, Gothe, Goethe und Gotz',
49-
'Weiss, Goldmann, Gobel, Weiss, Gothe, Goethe und Gotz',
51+
'Weiss, Goldmann, Goebel, Weiss, Goethe, Goethe und Goetz',
52+
'Weiss, Goldmann, Goebel, Weiss, Goethe, Goethe und Goetz',
5053
$isIconv
5154
],
5255
[

lib/internal/Magento/Framework/Filter/Test/Unit/TranslitUrlTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Filter\Test\Unit;
77

8+
/**
9+
* Translit url test.
10+
*/
811
class TranslitUrlTest extends \PHPUnit\Framework\TestCase
912
{
1013
/**
@@ -45,8 +48,8 @@ public function filterDataProvider()
4548
['привет мир', 'privet-mir', 'privet-mir', $isIconv],
4649
[
4750
'Weiß, Goldmann, Göbel, Weiss, Göthe, Goethe und Götz',
48-
'weiss-goldmann-gobel-weiss-gothe-goethe-und-gotz',
49-
'weiss-goldmann-gobel-weiss-gothe-goethe-und-gotz',
51+
'weiss-goldmann-goebel-weiss-goethe-goethe-und-goetz',
52+
'weiss-goldmann-goebel-weiss-goethe-goethe-und-goetz',
5053
$isIconv
5154
],
5255
[

lib/internal/Magento/Framework/Filter/Translit.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Translit implements \Zend_Filter_Interface
2525
'À' => 'a',
2626
'Á' => 'a',
2727
'Â' => 'a',
28-
'Ä' => 'a',
28+
'Ä' => 'ae',
2929
'Å' => 'a',
3030
'Æ' => 'ae',
3131
'Ç' => 'c',
@@ -40,18 +40,18 @@ class Translit implements \Zend_Filter_Interface
4040
'Ó' => 'o',
4141
'Ô' => 'o',
4242
'Õ' => 'o',
43-
'Ö' => 'o',
43+
'Ö' => 'oe',
4444
'Ø' => 'o',
4545
'Ù' => 'u',
4646
'Ú' => 'u',
4747
'Û' => 'u',
48-
'Ü' => 'u',
48+
'Ü' => 'ue',
4949
'Ý' => 'y',
5050
'ß' => 'ss',
5151
'à' => 'a',
5252
'á' => 'a',
5353
'â' => 'a',
54-
'ä' => 'a',
54+
'ä' => 'ae',
5555
'å' => 'a',
5656
'æ' => 'ae',
5757
'ç' => 'c',
@@ -67,12 +67,12 @@ class Translit implements \Zend_Filter_Interface
6767
'ó' => 'o',
6868
'ô' => 'o',
6969
'õ' => 'o',
70-
'ö' => 'o',
70+
'ö' => 'oe',
7171
'ø' => 'o',
7272
'ù' => 'u',
7373
'ú' => 'u',
7474
'û' => 'u',
75-
'ü' => 'u',
75+
'ü' => 'ue',
7676
'ý' => 'y',
7777
'þ' => 'p',
7878
'ÿ' => 'y',

0 commit comments

Comments
 (0)