From b9f1eb029642852d2fca0fc4540294e69e86b5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 28 Jun 2017 09:56:14 +0200 Subject: [PATCH] Use better description for multi-level collations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/Charsets.php | 4 +--- test/classes/CharsetsTest.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/Charsets.php b/libraries/Charsets.php index 94115f529c2a..5d24eb2718a0 100644 --- 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 index eb58da978c8f..b55a00468a0f 100644 --- 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'),