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

Improve message translatability

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2015-02-10 09:21:08 -05:00
parent 33465600d3
commit 10560ca131
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tbl_structure.php
View File

@ -46,17 +46,12 @@ if (isset($_REQUEST['reserved_word_check'])) {
if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
$columns_names = $_REQUEST['field_name'];
$reserved_keywords_names = array();
$reserved_keywords_fields = array();
foreach ($columns_names as $column) {
if (PMA_SQP_isKeyWord(trim($column))) {
$reserved_keywords_names[] = trim($column);
}
}
if (count($reserved_keywords_names) > 0) {
$reserved_keywords_fields[] = 'Column';
}
if (PMA_SQP_isKeyWord(trim($table))) {
$reserved_keywords_fields[] = 'Table';
$reserved_keywords_names[] = trim($table);
}
if (count($reserved_keywords_names) == 0) {
@ -65,11 +60,10 @@ if (isset($_REQUEST['reserved_word_check'])) {
$response->addJSON(
'message', sprintf(
_ngettext(
'The %s name \'%s\' is a MySQL reserved keyword.',
'The %s names \'%s\' are MySQL reserved keywords.',
'The name \'%s\' is a MySQL reserved keyword.',
'The names \'%s\' are MySQL reserved keywords.',
count($reserved_keywords_names)
),
implode(' and ', $reserved_keywords_fields),
implode(',', $reserved_keywords_names)
)
);