gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_9'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-06-30 00:17:47 -03:00
commit 2d864eb964
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -48,6 +48,9 @@ phpMyAdmin - ChangeLog
- 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
- 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

11
libraries/classes/Charsets/Collation.php
View File

@ -316,6 +316,7 @@ final class Collation
break;
case 'chinese':
case 'cn':
case 'zh':
if ($unicode) {
$name = _pgettext('Collation', 'Chinese');
}
@ -400,6 +401,9 @@ final class Collation
case 'ro':
$name = _pgettext('Collation', 'Romanian');
break;
case 'ru':
$name = _pgettext('Collation', 'Russian');
break;
case 'si':
case 'sinhala':
$name = _pgettext('Collation', 'Sinhalese');
@ -423,6 +427,7 @@ final class Collation
$name = _pgettext('Collation', 'Spanish (traditional)');
break;
case 'swedish':
case 'sv':
$name = _pgettext('Collation', 'Swedish');
break;
case 'thai':
@ -517,6 +522,9 @@ final class Collation
case 'as':
$suffixes[] = _pgettext('Collation variant', 'accent-sensitive');
break;
case 'ks':
$suffixes[] = _pgettext('Collation variant', 'kana-sensitive');
break;
case 'w2':
case 'l2':
$suffixes[] = _pgettext('Collation variant', 'multi-level');
@ -524,6 +532,9 @@ final class Collation
case 'bin':
$suffixes[] = _pgettext('Collation variant', 'binary');
break;
case 'nopad':
$suffixes[] = _pgettext('Collation variant', 'no-pad');
break;
}
}
}

8
test/classes/Charsets/CollationTest.php
View File

@ -422,6 +422,14 @@ class CollationTest extends TestCase
'gb18030_chinese_ci',
'Chinese, case-insensitive',
],
[
'utf8mb4_ja_0900_as_cs_ks',
'Japanese (UCA 9.0.0), accent-sensitive, case-sensitive, kana-sensitive',
],
[
'utf8mb4_unicode_520_nopad_ci',
'Unicode (UCA 5.2.0), no-pad, case-insensitive',
],
];
}
}