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

Simplify the code and improve messages

Browse Source 
- Use conditions rather than ternary operator, which is hard to read
  with multiple conditions.
- Do not concatenat translated message, use format string instead.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2014-03-31 10:20:20 +02:00
parent a42169c810
commit d1c5a385ee
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/tbl_columns_definition_form.lib.php
View File

@ -563,14 +563,23 @@ function PMA_getColumnMetaForDefault($columnMeta, $isDefault)
function PMA_getHtmlForColumnName($columnNumber, $ci, $ci_offset, $columnMeta)
{
$title = '';
$title .= (isset($columnMeta['column_status'])
&& $columnMeta['column_status']['isReferenced']) ? __('Referenced by ')
. implode(",", $columnMeta['column_status']['references']) . "." : '';
$title .= (!empty($title) && isset($columnMeta['column_status'])
&& $columnMeta['column_status']['isForeignKey']) ? "\n" : '';
$title .= (isset($columnMeta['column_status'])
&& $columnMeta['column_status']['isForeignKey']) ? __('Is a Foreign Key.') : '';
$title .= (empty($title)) ? __('Column') : '';
if (isset($columnMeta['column_status'])) {
if ($columnMeta['column_status']['isReferenced']) {
$title .= sprintf(
__('Referenced by %s.'),
implode(",", $columnMeta['column_status']['references'])
);
}
if ($columnMeta['column_status']['isForeignKey']) {
if (!empty($title)) {
$title .= "\n";
}
$title .= __('Is a foreign key.');
}
}
if (empty($title)) {
$title = __('Column');
}
$html = '<input' . (isset($columnMeta['column_status'])
&& !$columnMeta['column_status']['isEditable']?' disabled="disabled" ':' ')
. 'id="field_' . $columnNumber . '_' . ($ci - $ci_offset)