Merge branch 'QA_4_9'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jun 29, 2019 · 792563b · 792563b
2 parents 6b6d5ec + 48676c2
commit 792563b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
 - issue #14987 Fix weird error for empty collation
 - issue #15334 Fix export of GIS visualisation not working (PNG, PDF, SVG)
 - issue #14918 Use hex for the phpMyAdmin session token
+- issue        Added GB18030 Chinese collations description
 
 4.9.0.1 (2019-06-04)
 - issue #14478 phpMyAdmin no longer streams the export data

diff --git a/libraries/classes/Charsets/Collation.php b/libraries/classes/Charsets/Collation.php
@@ -233,11 +233,18 @@ private static function getCollationDescription(string $collation): string
                     case 'koi8r':
                         $name = _pgettext('Collation', 'Russian');
                         break;
-                    // Simplified Chinese charsets
+                    // Chinese charsets
                     case 'gb2312':
                     case 'gbk':
                         $name = _pgettext('Collation', 'Simplified Chinese');
                         break;
+                    case 'big5':
+                        $name = _pgettext('Collation', 'Traditional Chinese');
+                        break;
+                    case 'gb18030':
+                        $name = _pgettext('Collation', 'Chinese');
+                        $unicode = true;
+                        break;
                     // Japanese charsets
                     case 'sjis':
                     case 'ujis':
@@ -255,9 +262,6 @@ private static function getCollationDescription(string $collation): string
                     case 'armscii':
                         $name = _pgettext('Collation', 'Armenian');
                         break;
-                    case 'big5':
-                        $name = _pgettext('Collation', 'Traditional Chinese');
-                        break;
                     case 'cp1251':
                         $name = _pgettext('Collation', 'Cyrillic');
                         break;