Use better description for multi-level collations

Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Jun 28, 2017 · b9f1eb0 · b9f1eb0
1 parent 0807345
commit b9f1eb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/libraries/Charsets.php b/libraries/Charsets.php
@@ -572,10 +572,8 @@ public static function getCollationDescr($collation)
                         $suffixes[] = _pgettext('Collation variant', 'accent-sensitive');
                         break;
                     case 'w2':
-                        $suffixes[] = _pgettext('Collation variant', 'weight=2');
-                        break;
                     case 'l2':
-                        $suffixes[] = _pgettext('Collation variant', 'level=2');
+                        $suffixes[] = _pgettext('Collation variant', 'multi-level');
                         break;
                     case 'bin':
                         $suffixes[] = _pgettext('Collation variant', 'binary');

diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php
@@ -121,7 +121,7 @@ public function collationDescr()
             array('utf8mb4_unicode_ci', 'Unicode (UCA 4.0.0), case-insensitive'),
             array('utf8mb4_tr_0900_ai_ci', 'Turkish (UCA 9.0.0), accent-insensitive, case-insensitive'),
             array('utf8mb4_turkish_ci', 'Turkish (UCA 4.0.0), case-insensitive'),
-            array('utf32_thai_520_w2', 'Thai (UCA 5.2.0), weight=2'),
+            array('utf32_thai_520_w2', 'Thai (UCA 5.2.0), multi-level'),
             array('utf8mb4_czech_ci', 'Czech (UCA 4.0.0), case-insensitive'),
             array('cp1250_czech_cs', 'Czech, case-sensitive'),
             array('latin1_general_ci', 'West European, case-insensitive'),