From 8e51b51cae5d3f7dc8e66c1dad2609da4bf83d97 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Thu, 21 Jul 2016 15:43:19 +0200
Subject: [PATCH] Added translator and translations to ListShortcodesCommand

---
 module/CLI/lang/es.mo                         | Bin 2199 -> 2749 bytes
 module/CLI/lang/es.po                         |  43 +++++++++++++++---
 .../CLI/src/Command/ListShortcodesCommand.php |  36 ++++++++++-----
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/module/CLI/lang/es.mo b/module/CLI/lang/es.mo
index 2dcd57bcde8e004d9f701961ff46710a00bf1717..002ecddd3c899feefce8fafe3ebbccf18725531c 100644
GIT binary patch
delta 1004
zcmX|;O-K}B7{_0Cx75B&%RbEL4Ky_f68t!}n<fQYVrC?CnP%SHf!P_G88sx>Q-qz0
zAu@;{ymlz|CUsgm*1d}mc?vpojfj5F?C1l}`<r*3c|QKnyzKncUEAs^yinLlycgfb
z`|)=z99S`@)NxpXm*6~{gs)%;Zovtt^GbC=2NvK8JOCfTLvRfi;W|75zcu4E^(*_}
z4;&}ZPIfCSK}oy@rSToO53a-Wa07P3ui1S&i+Aj4HtvBv#0TJa#9W4Fx%W}L2&do`
zRa5E-57WH(0%zgrHl<F$2ap`~6pFHE@F3iPW%vQg#{NN3daAuS@E|O5ABTJ4L)Zyx
za0WhyQs)O8qrdvigRFQEd1J5$C1C|h<29(^Ylx84j&e$DKQ7H>P{NA8kv0XX$p*z}
zk^bWJk{!&gO0q&}Cf0$oMRiOrnEWR(8II+s!?<i_$3#WG{<vkJrEeneW7l6Ydc}<^
zdeK@iYSN0Ehqgn*vy;5f&GeStDAtze>8KKfv7WnGj?{GMF1WtsC4X}pqqFIIJ8+D;
zRWbU$8<HRebsT6<vIqMk?Z&1W=|vN!p`qkW{`$aeH*(`h+rg3_tNCC_SFB~D>1|hx
zqdhCDll;t=aw8X$3x#vJk>UDW;d5>{8{Z1a_W4vVHr~oeYRcG^?9`4)mDp~h?k8tj
z?+%F;QsTg|BB`IMp+Xp2kwTdcc7(0Aew>_W)E##rNaKMj(<5}NCfx0%tyCTbMWFFa
y)%bCM$N-VeafXu7wtFKt8k^(=GS9L|rrA}RTb^zCtCqu-EZx}jVz;_mTm1+4iNRX{

delta 456
zcmX}nJxc>Y5P;#iz1x_?uS5ufSZEW2h)4vr5l@X`5!7HS$RUCJ0I{)16Cv6zVy7sU
zX(U*QV55y_;SUf6I}3X&-#LQ|bI;E0-OSEi?lfC}8wgH>l_iFWD`JqC@OZGAsQD2t
z;02cO0~axGM3%9J0k*IYuQ9~?PVV_4v*a1<!ZqZ(x@@x1!aJD5a~#JTOyfIhvo9Pa
zf3|;xzj1|pDj~9g`?!UV$dL@ur58uAjFYGrJHQZ+F+qQMVx!Z)Vg)}@C!R?XxQ=>$
zh}<JCqJ<gke`&*hB1QCc-e!<e@xS_td&P?~(oN`aq6vdZ(4IGAUQmkms;=o*+>d|e
lUV^e)vY{!?xrWV~>0-NOAB<hC?$#oAncQ}T)U7L|qhDd8F`NJZ

diff --git a/module/CLI/lang/es.po b/module/CLI/lang/es.po
index 595211c2..0f84f96d 100644
--- a/module/CLI/lang/es.po
+++ b/module/CLI/lang/es.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shlink 1.0\n"
-"POT-Creation-Date: 2016-07-21 15:28+0200\n"
-"PO-Revision-Date: 2016-07-21 15:32+0200\n"
+"POT-Creation-Date: 2016-07-21 15:40+0200\n"
+"PO-Revision-Date: 2016-07-21 15:41+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -18,7 +18,8 @@ msgstr ""
 "X-Poedit-SearchPath-1: config\n"
 
 msgid "Generates a shortcode for provided URL and returns the short URL"
-msgstr "Genera un código corto para la URL proporcionada y devuelve la URL acortada"
+msgstr ""
+"Genera un código corto para la URL proporcionada y devuelve la URL acortada"
 
 msgid "The long URL to parse"
 msgstr "La URL larga a procesar"
@@ -40,16 +41,21 @@ msgid "Provided URL \"%s\" is invalid. Try with a different one."
 msgstr "La URL proporcionada \"%s\" e inválida. Prueba con una diferente."
 
 msgid "Returns the detailed visits information for provided short code"
-msgstr "Devuelve la información detallada de visitas para el código corto proporcionado"
+msgstr ""
+"Devuelve la información detallada de visitas para el código corto "
+"proporcionado"
 
 msgid "The short code which visits we want to get"
 msgstr "El código corto del cual queremos obtener las visitas"
 
 msgid "Allows to filter visits, returning only those older than start date"
-msgstr "Permite filtrar las visitas, devolviendo sólo aquellas más antiguas que startDate"
+msgstr ""
+"Permite filtrar las visitas, devolviendo sólo aquellas más antiguas que "
+"startDate"
 
 msgid "Allows to filter visits, returning only those newer than end date"
-msgstr "Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"
+msgstr ""
+"Permite filtrar las visitas, devolviendo sólo aquellas más nuevas que endDate"
 
 msgid "A short code was not provided. Which short code do you want to use?:"
 msgstr "No se prporcionó un código corto. ¿Qué código corto deseas usar?"
@@ -65,3 +71,28 @@ msgstr "Dirección remota"
 
 msgid "User agent"
 msgstr "Agente de usuario"
+
+msgid "List all short URLs"
+msgstr "Listar todas las URLs cortas"
+
+#, php-format
+msgid "The first page to list (%s items per page)"
+msgstr "La primera página a listar (%s elementos por página)"
+
+msgid "Short code"
+msgstr "Código corto"
+
+msgid "Original URL"
+msgstr "URL original"
+
+msgid "Date created"
+msgstr "Fecha de creación"
+
+msgid "Visits count"
+msgstr "Número de visitas"
+
+msgid "You have reached last page"
+msgstr "Has alcanzado la última página"
+
+msgid "Continue with page"
+msgstr "Continuar con la página"
diff --git a/module/CLI/src/Command/ListShortcodesCommand.php b/module/CLI/src/Command/ListShortcodesCommand.php
index 1db1f3fb..e59aa903 100644
--- a/module/CLI/src/Command/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/ListShortcodesCommand.php
@@ -13,6 +13,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Zend\I18n\Translator\TranslatorInterface;
 
 class ListShortcodesCommand extends Command
 {
@@ -22,28 +23,37 @@ class ListShortcodesCommand extends Command
      * @var ShortUrlServiceInterface
      */
     private $shortUrlService;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
 
     /**
      * ListShortcodesCommand constructor.
      * @param ShortUrlServiceInterface|ShortUrlService $shortUrlService
+     * @param TranslatorInterface $translator
      *
-     * @Inject({ShortUrlService::class})
+     * @Inject({ShortUrlService::class, "translator"})
      */
-    public function __construct(ShortUrlServiceInterface $shortUrlService)
+    public function __construct(ShortUrlServiceInterface $shortUrlService, TranslatorInterface $translator)
     {
-        parent::__construct(null);
         $this->shortUrlService = $shortUrlService;
+        $this->translator = $translator;
+        parent::__construct(null);
     }
 
     public function configure()
     {
         $this->setName('shortcode:list')
-             ->setDescription('List all short URLs')
+             ->setDescription($this->translator->translate('List all short URLs'))
              ->addOption(
                  'page',
                  'p',
                  InputOption::VALUE_OPTIONAL,
-                 sprintf('The first page to list (%s items per page)', PaginableRepositoryAdapter::ITEMS_PER_PAGE),
+                 sprintf(
+                     $this->translator->translate('The first page to list (%s items per page)'),
+                     PaginableRepositoryAdapter::ITEMS_PER_PAGE
+                 ),
                  1
              );
     }
@@ -59,10 +69,10 @@ class ListShortcodesCommand extends Command
             $page++;
             $table = new Table($output);
             $table->setHeaders([
-                'Short code',
-                'Original URL',
-                'Date created',
-                'Visits count',
+                $this->translator->translate('Short code'),
+                $this->translator->translate('Original URL'),
+                $this->translator->translate('Date created'),
+                $this->translator->translate('Visits count'),
             ]);
 
             foreach ($result as $row) {
@@ -72,10 +82,14 @@ class ListShortcodesCommand extends Command
 
             if ($this->isLastPage($result)) {
                 $continue = false;
-                $output->writeln('<info>You have reached last page</info>');
+                $output->writeln(
+                    sprintf('<info>%s</info>', $this->translator->translate('You have reached last page'))
+                );
             } else {
                 $continue = $helper->ask($input, $output, new ConfirmationQuestion(
-                    sprintf('<question>Continue with page <bg=cyan;options=bold>%s</>? (y/N)</question> ', $page),
+                    sprintf('<question>' . $this->translator->translate(
+                        'Continue with page'
+                    ) . ' <bg=cyan;options=bold>%s</>? (y/N)</question> ', $page),
                     false
                 ));
             }