From be585531a306d0accccb30f67e27f0b850b62ff8 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 9 Jan 2015 12:26:24 -0500
Subject: [PATCH] Plural form of message

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 tbl_structure.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tbl_structure.php b/tbl_structure.php
index db980b0e82..ca307d9478 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -45,19 +45,22 @@ if (isset($_REQUEST['reserved_word_check'])) {
     $response = PMA_Response::getInstance();
     if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
         $columns_names = $_REQUEST['field_name'];
-        $cols = "";
+        $reserved_keywords_columns = array();
         foreach ($columns_names as $column) {
             if (PMA_SQP_isKeyWord($column)) {
-                $cols .= $column . ", ";
+                $reserved_keywords_columns[] = $column;
             }
         }
-        if ($cols == "") {
+        if (count($reserved_keywords_columns) == 0) {
             $response->isSuccess(false);
         }
         $response->addJSON(
             'message', sprintf(
-                __('The column name(s) \'%s\' are MySQL reserved keyword.'),
-                trim($cols, ", ")
+                _ngettext(
+                    'The column name \'%s\' is a MySQL reserved keyword.',
+                    'The column names \'%s\' are MySQL reserved keywords.',
+                    count($reserved_keywords_columns)),
+                implode(',', $reserved_keywords_columns)
             )
         );
     } else {