Revert "Revert "[+]: prefer "Russian - Passport (2013), ICAO" instead…

… of "Russian - GOST 7.79-2000(B)""" This reverts commit 2ee2878.
voku · Jan 24, 2022 · 9bd89e8 · 9bd89e8
1 parent 73c3eea
commit 9bd89e8
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 68 deletions.
diff --git a/src/voku/helper/data/ascii_by_languages.php b/src/voku/helper/data/ascii_by_languages.php
@@ -1060,9 +1060,9 @@
         'Я' => 'Ya',
         'я' => 'ya',
     ],
-    // Russian - Passport (2013), ICAO
+    // Russian - GOST 7.79-2000(B)
     // -> https://en.m.wikipedia.org/wiki/Romanization_of_Russian#content-collapsible-block-1
-    'ru__passport_2013' => [
+    'ru__gost_2000_b' => [
         'А' => 'A',
         'а' => 'a',
         'Б' => 'B',
@@ -1075,8 +1075,8 @@
         'д' => 'd',
         'Е' => 'E',
         'е' => 'e',
-        'Ё' => 'E',
-        'ё' => 'e',
+        'Ё' => 'Yo',
+        'ё' => 'yo',
         'Ж' => 'Zh',
         'ж' => 'zh',
         'З' => 'Z',
@@ -1107,42 +1107,42 @@
         'у' => 'u',
         'Ф' => 'F',
         'ф' => 'f',
-        'Х' => 'Kh',
-        'х' => 'kh',
-        'Ц' => 'Ts',
-        'ц' => 'ts',
+        'Х' => 'X',
+        'х' => 'x',
+        'Ц' => 'Cz',
+        'ц' => 'cz',
         'Ч' => 'Ch',
         'ч' => 'ch',
         'ш' => 'sh',
         'Ш' => 'Sh',
-        'Щ' => 'Shch',
-        'щ' => 'shch',
-        'Ъ' => 'Ie',
-        'ъ' => 'ie',
-        'Ы' => 'Y',
-        'ы' => 'y',
+        'Щ' => 'Shh',
+        'щ' => 'shh',
+        'Ъ' => '',
+        'ъ' => '',
+        'Ы' => 'Y\'',
+        'ы' => 'y\'',
         'Ь' => '',
         'ь' => '',
-        'Э' => 'E',
-        'э' => 'e',
-        'Ю' => 'Iu',
-        'ю' => 'iu',
-        'Я' => 'Ia',
-        'я' => 'ia',
-        'І' => '',
-        'і' => '',
-        'Ѳ' => '',
-        'ѳ' => '',
-        'Ѣ' => '',
-        'ѣ' => '',
-        'Ѵ' => '',
-        'ѵ' => '',
+        'Э' => 'E\'',
+        'э' => 'e\'',
+        'Ю' => 'Yu',
+        'ю' => 'yu',
+        'Я' => 'Ya',
+        'я' => 'ya',
+        'І' => 'I',
+        'і' => 'i',
+        'Ѳ' => 'Fh',
+        'ѳ' => 'fh',
+        'Ѣ' => 'Ye',
+        'ѣ' => 'ye',
+        'Ѵ' => 'Yh',
+        'ѵ' => 'yh',
         'Є' => '',
         'є' => '',
         'Ѥ' => '',
         'ѥ' => '',
-        'Ѕ' => '',
-        'ѕ' => '',
+        'Ѕ' => 'Js',
+        'ѕ' => 'js',
         'Ꙋ' => '',
         'ꙋ' => '',
         'Ѡ' => '',
@@ -1162,9 +1162,9 @@
         'Ѱ' => '',
         'ѱ' => '',
     ],
-    // Russian - GOST 7.79-2000(B)
+    // Russian - Passport (2013), ICAO
     // -> https://en.m.wikipedia.org/wiki/Romanization_of_Russian#content-collapsible-block-1
-    'ru__gost_2000_b' => [
+    'ru__passport_2013' => [
         'А' => 'A',
         'а' => 'a',
         'Б' => 'B',
@@ -1177,8 +1177,8 @@
         'д' => 'd',
         'Е' => 'E',
         'е' => 'e',
-        'Ё' => 'Yo',
-        'ё' => 'yo',
+        'Ё' => 'E',
+        'ё' => 'e',
         'Ж' => 'Zh',
         'ж' => 'zh',
         'З' => 'Z',
@@ -1209,42 +1209,42 @@
         'у' => 'u',
         'Ф' => 'F',
         'ф' => 'f',
-        'Х' => 'X',
-        'х' => 'x',
-        'Ц' => 'Cz',
-        'ц' => 'cz',
+        'Х' => 'Kh',
+        'х' => 'kh',
+        'Ц' => 'Ts',
+        'ц' => 'ts',
         'Ч' => 'Ch',
         'ч' => 'ch',
         'ш' => 'sh',
         'Ш' => 'Sh',
-        'Щ' => 'Shh',
-        'щ' => 'shh',
-        'Ъ' => '',
-        'ъ' => '',
+        'Щ' => 'Shch',
+        'щ' => 'shch',
+        'Ъ' => 'Ie',
+        'ъ' => 'ie',
         'Ы' => 'Y',
         'ы' => 'y',
         'Ь' => '',
         'ь' => '',
         'Э' => 'E',
         'э' => 'e',
-        'Ю' => 'Yu',
-        'ю' => 'yu',
-        'Я' => 'Ya',
-        'я' => 'ya',
-        'І' => 'I',
-        'і' => 'i',
-        'Ѳ' => 'Fh',
-        'ѳ' => 'fh',
-        'Ѣ' => 'Ye',
-        'ѣ' => 'ye',
-        'Ѵ' => 'Yh',
-        'ѵ' => 'yh',
+        'Ю' => 'Iu',
+        'ю' => 'iu',
+        'Я' => 'Ia',
+        'я' => 'ia',
+        'І' => '',
+        'і' => '',
+        'Ѳ' => '',
+        'ѳ' => '',
+        'Ѣ' => '',
+        'ѣ' => '',
+        'Ѵ' => '',
+        'ѵ' => '',
         'Є' => '',
         'є' => '',
         'Ѥ' => '',
         'ѥ' => '',
-        'Ѕ' => 'Js',
-        'ѕ' => 'js',
+        'Ѕ' => '',
+        'ѕ' => '',
         'Ꙋ' => '',
         'ꙋ' => '',
         'Ѡ' => '',

diff --git a/src/voku/helper/data/ascii_extras_by_languages.php b/src/voku/helper/data/ascii_extras_by_languages.php
@@ -199,8 +199,8 @@
         '&' => ' i ',
         '+' => ' plus ',
     ],
-    // Russian - Passport (2013), ICAO
-    'ru__passport_2013' => [
+    // Russian - GOST 7.79-2000(B)
+    'ru__gost_2000_b' => [
         '=' => ' ravnyj ',
         '%' => ' procent ',
         '∑' => ' summa ',
@@ -210,8 +210,8 @@
         '&' => ' i ',
         '+' => ' plus ',
     ],
-    // Russian - GOST 7.79-2000(B)
-    'ru__gost_2000_b' => [
+    // Russian - Passport (2013), ICAO
+    'ru__passport_2013' => [
         '=' => ' ravnyj ',
         '%' => ' procent ',
         '∑' => ' summa ',

diff --git a/src/voku/helper/data/ascii_language_max_key.php b/src/voku/helper/data/ascii_language_max_key.php
@@ -31,8 +31,8 @@
     'fi'                => 1,
     'ka'                => 1,
     'ru'                => 1,
-    'ru__passport_2013' => 1,
     'ru__gost_2000_b'   => 1,
+    'ru__passport_2013' => 1,
     'uk'                => 1,
     'kk'                => 1,
     'cs'                => 1,

diff --git a/tests/AsciiGlobalTest.php b/tests/AsciiGlobalTest.php
@@ -25,9 +25,9 @@ public function slugifyProvider(): array
             ['user-at-host', 'user@host'],
             ['using-strings-like-foo-bar', 'Using strings like fòô bàř'],
             ['numbers-1234', 'numbers 1234'],
-            ['perevirka-ryadka', 'перевірка рядка'],
+            ['perevirka-riadka', 'перевірка рядка'],
             ['bukvar-s-bukvoi-y', 'букварь с буквой ы'],
-            ['podexal-k-podezdu-moego-doma', 'подъехал к подъезду моего дома'],
+            ['podieexal-k-podieezdu-moego-doma', 'подъехал к подъезду моего дома'],
             ['foo:bar:baz', 'Foo bar baz', ':'],
             ['a_string_with_underscores', 'A_string with_underscores', '_'],
             ['a_string_with_dashes', 'A string-with-dashes', '_'],
@@ -348,7 +348,6 @@ public function testToAscii(
         $replace_extra_symbols = false,
         $use_transliterate = false
     ) {
-        $result = '';
         for ($i = 0; $i <= 2; ++$i) { // keep this loop for simple performance tests
             $result = ASCII::to_ascii(
                 $str,
@@ -398,7 +397,7 @@ public function toAsciiProvider(): array
             [' TEST 3 Celsius ', ' ŤÉŚŢ 3°C', ASCII::ENGLISH_LANGUAGE_CODE, true, true],
             ['f = z = 3', 'φ = ź = 3'],
             ['perevirka', 'перевірка'],
-            ['lysaya gora', 'лысая гора'],
+            ['lysaia gora', 'лысая гора'],
             ['I  ', 'I ♥ 字'],
             ['I  ', 'I ♥ 字', ASCII::ENGLISH_LANGUAGE_CODE],
             ['I ♥ 字', 'I ♥ 字', ASCII::ENGLISH_LANGUAGE_CODE, false],
@@ -455,7 +454,7 @@ public function toAsciiProvider(): array
             ['Kyrgyzca', 'Кыргызча', ASCII::KIRGHIZ_LANGUAGE_CODE],
             ['Hayeren', 'Հայերեն', ASCII::ARMENIAN_LANGUAGE_CODE],
             ['bangla', 'বাংলা', ASCII::BENGALI_LANGUAGE_CODE],
-            ['belaruskaya', 'беларуская', ASCII::BELARUSIAN_LANGUAGE_CODE],
+            ['belaruskaia', 'беларуская', ASCII::BELARUSIAN_LANGUAGE_CODE],
             ['\'amaarenyaa', 'አማርኛ', ASCII::AMHARIC_LANGUAGE_CODE],
             ['Ri Ben Yu  (nihongo)', '日本語 (にほんご)', ASCII::JAPANESE_LANGUAGE_CODE],
             ['een oplossing - aou', 'één oplossing - äöü', ASCII::DUTCH_LANGUAGE_CODE],
@@ -464,7 +463,7 @@ public function toAsciiProvider(): array
             ['Eu nao falo portugues.', 'Eu não falo português.', ASCII::PORTUGUESE_LANGUAGE_CODE],
             ['lysaya gora', 'лысая гора', ASCII::RUSSIAN_LANGUAGE_CODE],
             ['lysaia gora', 'лысая гора', ASCII::RUSSIAN_PASSPORT_2013_LANGUAGE_CODE],
-            ['lysaya gora', 'лысая гора', ASCII::RUSSIAN_GOST_2000_B_LANGUAGE_CODE],
+            ['ly\'saya gora', 'лысая гора', ASCII::RUSSIAN_GOST_2000_B_LANGUAGE_CODE],
             ['shhuka', 'щука'],
             ['shhuka', 'щука', ASCII::EXTRA_LATIN_CHARS_LANGUAGE_CODE],
             ['Elliniko alfavito', 'Ελληνικό αλφάβητο', ASCII::GREEK_LANGUAGE_CODE],
@@ -506,7 +505,7 @@ public function toAsciiProvider(): array
             ['shhuka', 'щука', ASCII::RUSSIAN_GOST_2000_B_LANGUAGE_CODE],
             ['dity', 'діти', ASCII::UKRAINIAN_LANGUAGE_CODE],
             ['horokh', 'горох', ASCII::UKRAINIAN_LANGUAGE_CODE],
-            ['shchastya', 'щастя', ASCII::UKRAINIAN_LANGUAGE_CODE],
+            ['shchastia', 'щастя', ASCII::UKRAINIAN_LANGUAGE_CODE],
             ['Chernivtsi', 'Чернівці', ASCII::UKRAINIAN_LANGUAGE_CODE],
             ['shtany', 'штани', ASCII::UKRAINIAN_LANGUAGE_CODE],
             ['universitet', 'университет', ASCII::KAZAKH_LANGUAGE_CODE],