From 73a35a8f449bc3d0974f86f50d0b0e15d030c31e Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Thu, 21 Jul 2016 16:01:16 +0200
Subject: [PATCH] Added translator and translations to ResolveUrlCommand

---
 module/CLI/lang/es.mo                        | Bin 3165 -> 3826 bytes
 module/CLI/lang/es.po                        |  25 ++++++++++-
 module/CLI/src/Command/ResolveUrlCommand.php |  41 +++++++++++++------
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/module/CLI/lang/es.mo b/module/CLI/lang/es.mo
index 8c24a7b497614ef7e8e972d2c9326a246ca0d746..5d5830b3db3fb3b331f55692446c7766ffeddf52 100644
GIT binary patch
delta 1205
zcmZ9~Uq}=|9Ki9p(=+w@W0rsVqfKTK2boqHNR*Wdf%HcS3PRYt@mx4}Y;W(h2&5pW
z*A@#3A*l$Wx1)z%dJ%-^p?d2@A)=_ai15XizQ0XF8gA#aJ9{(p`~7AY>VGv%EmoIK
zD_S$xPOhUdr8@9(oQ~F3qEsEW<8eHVeRvmp@Waacno^}s@Vp;Sp~Y$}B0n`xw;tc&
z4*Y~0m6}q&x#?!0B%#zc?7=NKgcazc#v3RL%peoh3v9*LxB<W85nRFp*jlF4Ivhgz
z{|HI~dEAGuu#)}NA~z`peqar5WtL=|LK#1al{khHz$9+R+xVGkJ;vQU-y+&>e2V?}
z6?^d@lN)dn&*FU?#BW&7{;Dgf6hW&&l#*RSi7<<j*)+<6Pp}?;q8wEP(XfVU!7gk^
zekw~R8DGObyo0jNd+f#qlu9%*I7QNGh?~u5@H|dnJHADJYMHJRD_B)3(~T0qMU?S8
z%KVoo3A{m#ACUq@W4lm}wU$dhE%^qhn&eN(xugQp<jiHUW-by{5}<q+tF4L~5{Ozk
zy#%!B?_<<A(#tWfwkB@)Mx&<bC2*-4pB?Q`)JJ8NGvX+t(n;29+n$vNId>J##2+Qb
z9Y1G^OYvv1RKN8y`ochempWrbJ!11-n%>vBQR@eK*rttc+M8<%AC}&0J?Gnkn>OkH
zU+PgOryWnbUct$_(flzd2vdnm4Fe{~`(925qef>}cGFkPsLM7^IFZPN^NHv2j>DlX
zYl(Ms79W&-iN$Pqy}Z5ZYTh-z$q|EBFn-_`ZTWJnCF}SZCyF;`*jF2m_kr)Et@d0m
zllL4+BpgcCl}2%!%Hpx!tR9{#rrnHXF+Z?++_&S_A9k%L^W=XzaE)hl-jn1B-byla
uvt(n#+T>VUk16C$wm=fm`al>uZ32I8Hit5E?H=LH<anj?FZOUTIrRr?io=lr

delta 740
zcmYk)%PT}t9KiA49rIw!7{+Tn#%m#jsL3mN<WWjViiMhuvhhglY^Er7q>~~kb{4Xk
z1^xq8R@fkqvL)GgEPQ|0O@4Ly+;i^l-t#+;x9DvoaTj)P3Q<BUrUfjKYWzlxJ(oy6
z?qesOVlRF;;~gm?-SkJX2e&YcH|WL}4B$H!p~YYZMzKpIA+<adFffDJxQhD04r<~7
z*5fe-@fn-(9er5q`OS-=7TAM+T*ew)!(2Rd`WMdoPYf`>c)TKoB!uySRo7uT{ZOi1
zp)_J2{dtVy2@c^Ej$mb)NCX#=e~Llffo-h9L)5}AaS)$S^BbtLnE7RZ2VL<b>WUYz
zAD2)+JjX7)MrxBtx=0q5;xIO%<}G6rZlE67nbW^V&Ch2NEvy>LupJXDSn_E9LzDEZ
zG<1t~)mkw-{uf%X7RzGnW6N>g=uxsUc0oGC+;->@glL&Gy=xjQro!Gb?vj1^bdY;u
zABSBr&wf*vvXczCCoHq;*)VbMn7Q+gn_=I&E7oEjeU+|QYto<kWF_1Dua=n$9GQ4<
M%6tW9%}U1f4|ZrrEdT%j

diff --git a/module/CLI/lang/es.po b/module/CLI/lang/es.po
index 2af67aaa..b8fd2f7a 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:48+0200\n"
-"PO-Revision-Date: 2016-07-21 15:49+0200\n"
+"POT-Creation-Date: 2016-07-21 15:54+0200\n"
+"PO-Revision-Date: 2016-07-21 15:56+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -112,3 +112,24 @@ msgstr "Dirección localizada en \"%s\""
 
 msgid "Finished processing all IPs"
 msgstr "Finalizado el procesado de todas las IPs"
+
+msgid "Returns the long URL behind a short code"
+msgstr "Devuelve la URL larga detrás de un código corto"
+
+msgid "The short code to parse"
+msgstr "El código corto a convertir"
+
+msgid "A short code was not provided. Which short code do you want to parse?:"
+msgstr ""
+"No se proporcionó un código corto. ¿Qué código corto quieres convertir?"
+
+#, php-format
+msgid "No URL found for short code \"%s\""
+msgstr "No se ha encontrado ninguna URL para el código corto \"%s\""
+
+msgid "Long URL:"
+msgstr "URL larga:"
+
+#, php-format
+msgid "Provided short code \"%s\" has an invalid format."
+msgstr "El código corto proporcionado \"%s\" tiene un formato inválido."
diff --git a/module/CLI/src/Command/ResolveUrlCommand.php b/module/CLI/src/Command/ResolveUrlCommand.php
index 01dad903..62d81f41 100644
--- a/module/CLI/src/Command/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/ResolveUrlCommand.php
@@ -11,6 +11,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
+use Zend\I18n\Translator\TranslatorInterface;
 
 class ResolveUrlCommand extends Command
 {
@@ -18,24 +19,34 @@ class ResolveUrlCommand extends Command
      * @var UrlShortenerInterface
      */
     private $urlShortener;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
 
     /**
      * ResolveUrlCommand constructor.
      * @param UrlShortenerInterface|UrlShortener $urlShortener
+     * @param TranslatorInterface $translator
      *
-     * @Inject({UrlShortener::class})
+     * @Inject({UrlShortener::class, "translator"})
      */
-    public function __construct(UrlShortenerInterface $urlShortener)
+    public function __construct(UrlShortenerInterface $urlShortener, TranslatorInterface $translator)
     {
-        parent::__construct(null);
         $this->urlShortener = $urlShortener;
+        $this->translator = $translator;
+        parent::__construct(null);
     }
 
     public function configure()
     {
         $this->setName('shortcode:parse')
-             ->setDescription('Returns the long URL behind a short code')
-             ->addArgument('shortCode', InputArgument::REQUIRED, 'The short code to parse');
+             ->setDescription($this->translator->translate('Returns the long URL behind a short code'))
+             ->addArgument(
+                 'shortCode',
+                 InputArgument::REQUIRED,
+                 $this->translator->translate('The short code to parse')
+             );
     }
 
     public function interact(InputInterface $input, OutputInterface $output)
@@ -47,9 +58,10 @@ class ResolveUrlCommand extends Command
 
         /** @var QuestionHelper $helper */
         $helper = $this->getHelper('question');
-        $question = new Question(
-            '<question>A short code was not provided. Which short code do you want to parse?:</question> '
-        );
+        $question = new Question(sprintf(
+            '<question>%s</question> ',
+            $this->translator->translate('A short code was not provided. Which short code do you want to parse?:')
+        ));
 
         $shortCode = $helper->ask($input, $output, $question);
         if (! empty($shortCode)) {
@@ -64,15 +76,18 @@ class ResolveUrlCommand extends Command
         try {
             $longUrl = $this->urlShortener->shortCodeToUrl($shortCode);
             if (! isset($longUrl)) {
-                $output->writeln(sprintf('<error>No URL found for short code "%s"</error>', $shortCode));
+                $output->writeln(sprintf(
+                    '<error>' . $this->translator->translate('No URL found for short code "%s"') . '</error>',
+                    $shortCode
+                ));
                 return;
             }
 
-            $output->writeln(sprintf('Long URL <info>%s</info>', $longUrl));
+            $output->writeln(sprintf('%s <info>%s</info>', $this->translator->translate('Long URL:'), $longUrl));
         } catch (InvalidShortCodeException $e) {
-            $output->writeln(
-                sprintf('<error>Provided short code "%s" has an invalid format.</error>', $shortCode)
-            );
+            $output->writeln(sprintf('<error>' . $this->translator->translate(
+                'Provided short code "%s" has an invalid format.'
+            ) . '</error>', $shortCode));
         }
     }
 }