From 6451c1371fbb61a890dbf46caea3ffaa0a9e0a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 30 Jun 2019 00:09:07 -0300 Subject: [PATCH] Add description for the _nopad (NO PAD) collation suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + libraries/classes/Charsets.php | 3 +++ test/classes/CharsetsTest.php | 1 + 3 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 63f08d6a02..433cca7c08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - issue Added GB18030 Chinese collations description - issue Added Russian, Swedish, Slovak and Chinese UCA 9.0.0 collations description - issue Added description for the _ks (kana-sensitive) collation suffix +- issue Added description for the _nopad (NO PAD) collation suffix 4.9.0.1 (2019-06-04) - issue #14478 phpMyAdmin no longer streams the export data diff --git a/libraries/classes/Charsets.php b/libraries/classes/Charsets.php index 47c12cb488..cfb6cb832b 100644 --- a/libraries/classes/Charsets.php +++ b/libraries/classes/Charsets.php @@ -681,6 +681,9 @@ class Charsets case 'bin': $suffixes[] = _pgettext('Collation variant', 'binary'); break; + case 'nopad': + $suffixes[] = _pgettext('Collation variant', 'no-pad'); + break; } } } diff --git a/test/classes/CharsetsTest.php b/test/classes/CharsetsTest.php index fbdcd35711..2483fd8acb 100644 --- a/test/classes/CharsetsTest.php +++ b/test/classes/CharsetsTest.php @@ -139,6 +139,7 @@ class CharsetsTest extends TestCase array('utf8mb4_de_pb_0900_ai_ci', 'German (phone book order) (UCA 9.0.0), accent-insensitive, case-insensitive'), array('utf8mb4_de_0900_ai_ci', 'German (dictionary order) (UCA 9.0.0), accent-insensitive, case-insensitive'), array('utf8mb4_ja_0900_as_cs_ks', 'Japanese (UCA 9.0.0), accent-sensitive, case-sensitive, kana-sensitive'), + array('utf8mb4_unicode_520_nopad_ci', 'Unicode (UCA 5.2.0), no-pad, case-insensitive'), ); }