From 943c99d1f01cf375eec99cb2ca4f4c428d372201 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 4 Jul 2014 08:42:31 -0400
Subject: [PATCH] Improve translatability

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/Console.class.php | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/libraries/Console.class.php b/libraries/Console.class.php
index 102441ae7f..d24e3126c5 100644
--- a/libraries/Console.class.php
+++ b/libraries/Console.class.php
@@ -98,13 +98,36 @@ class PMA_Console
                 . '<span class="text targetdb">' . __('Database') . ': <span>%s</span></span>';
 
             $bookmarks = PMA_Bookmark_getList();
-            $output .= '<div class="message welcome"><span>'
-                    .  (count($bookmarks) > 0 ? __('Total ') .  count($bookmarks) . __(' bookmarks, ')
-                        . '<span class="bookmark_label">' . __('private')
-                        . '</span> and <span class="bookmark_label shared">' . __('shared')
-                        . '</span>' . __(' bookmarks included.')
-                        : __('No bookmarks'))
-                    .  '</span></div>';
+            $output .= '<div class="message welcome"><span>';
+            $count_bookmarks = count($bookmarks);
+            if ($count_bookmarks > 0) {
+                $bookmarks_message = sprintf(
+                    _ngettext(
+                        'Total %d bookmark',
+                        'Total %d bookmarks',
+                        $count_bookmarks),
+                    $count_bookmarks
+                );
+                $private_message = sprintf(
+                    '<span class="bookmark_label">%1$s</span>',
+                    __('private')
+                );
+                $shared_message = sprintf(
+                    '<span class="bookmark_label shared">%1$s</span>',
+                    __('shared')
+                );
+                $output .= sprintf(
+                    /* l10n: First parameter will be replaced with the translation for Total and the number of bookmarks, second one with the translation for private and the third one, with the translation for shared */
+                    __('%1$s, %2$s and %3$s bookmarks included'),
+                    $bookmarks_message,
+                    $private_message,
+                    $shared_message
+                );
+            } else {
+                $output .= __('No bookmarks');
+            }
+            unset($count_bookmarks, $private_message, $shared_message);
+            $output .= '</span></div>';
             foreach ($bookmarks as $key => $val) {
                 $output .= '<div class="message collapsed bookmark" bookmarkid="'
                 .  $val['id'] . '" bookmarkdb="' . $val['db']