From d1c5a385eebf064dcd919cee18d707f693a3116b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 31 Mar 2014 10:20:20 +0200
Subject: [PATCH] Simplify the code and improve messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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>
---
 libraries/tbl_columns_definition_form.lib.php | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index 21e3832a88..0e5d73af35 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -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)