From 6a05265a4846c14c706488f82cd5aebd8daca1a1 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Thu, 21 Jul 2016 15:50:27 +0200
Subject: [PATCH] Added translator and translations to ProcessVisitsCommand

---
 module/CLI/lang/es.mo                         | Bin 2749 -> 3165 bytes
 module/CLI/lang/es.po                         |  20 +++++++++-
 .../CLI/src/Command/ProcessVisitsCommand.php  |  35 +++++++++++++-----
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/module/CLI/lang/es.mo b/module/CLI/lang/es.mo
index 002ecddd3c899feefce8fafe3ebbccf18725531c..8c24a7b497614ef7e8e972d2c9326a246ca0d746 100644
GIT binary patch
delta 1050
zcmYk)Pe>I(9Ki8;K3_iVm1U{V)EtFM!~O_j8T~Od;X%-oqEnac?dDt9cH_-bWQ34`
zoq||`qDy(|;LSrBbn;RVbSgVk6hYT6UW$Ugzum<e7(P3*zuEcyX7*+4r{e7AmiqgO
zwv*mPFJzP&z~3nCah+1__ykYjGEU&nbpCi&sgsP)<2XLR7W|0y_yY^LhMkyUax-@0
zm{PN9kcSQ?F5@<wM_KR)CGaWk$7i?+zvCfX!v-A8C2_+j365hE&f#9Xi><hvj^C#5
ze_?_BRc?b)I|yjOuT;Gcdl@(9;|$dho?=|XZhVes@I9Wz-Hl2WaR&LOicn7AA@<`U
zO5*SEG=4*gKS-8c?5|2ZNX3^>DmFNYw@?<o#xYz)a#O{PN^Qj+oWdcLxH%lbdni}-
zDjk18iEn2UNo)W$9>rM-R&DhEn*_;SNs}X%swHDie7#A+k}So<*S0-<BUj16#0kk1
zd&f<#pqajfF8`V|is_4wjDIQq`DBv+B)*O~W1gF$V|5E{wq0|K(OyuoLdVutsQY%A
zzNjaAASz^Uc22s!YpT4sQVS{sy8g7bJWrR(Cc2ZI>L^Y7L5<h4-m3;C)K>Dv=tFjR
zR8}}fUv-Te8hx$m)SP4|H}JJ<v>$}pIHA7ogsS{+gHm}ZUw<Q$IUL>2?a7QTE#`Xb
zx+mP4Q>nNsOMbGMJ7d|FcKjsYHw~-(<Z5{`9caf(6PAJP=rFJ?ilj^83;7GhIC1$x
zsVo8O`A2{9N6sa=Sn+~5c^2A%FL6vtsce(v;s?5FY2(VKCbTYkPQ~S`*2)V%Ey?nE
KM@b`%^O?V2Teisn

delta 643
zcmXxhze_?<6u|NG^kr&4EYq@IkWeT=Py|X-@AV4=p`xW|Z4W0K3YS1^DlU;iExERY
zbALi@1q}s}V+~C~L-ajQJ8<6TU9b0@d(VAI+{H_;QTtqoVRDRYl2hc3#e;BsB17on
zBJSV{*3iXQT*e8%NEG+b#v*p(A@*Vg9jxL2KDXve^4b2w4`!JNvAPpo)P*_J!rK_e
zDo$e^<M_}XH{0`(j#l9j9AQ3%ZyaU`lZ+?%xPxoBDkYIJFYEkpk6Sn%6iHwKStBQ?
zCp*O+tYaQ;Q9JgFdeYHQYr|=D7-unn2iT7#+{81~@4RD%`trq#wm8l4GU%W#D54gw
z-~?VG2k|1tQ|G!!Ev_47TDT3bD0rbA)S!fS#onO(VBg|u3$>U=grtiyr~^XpNkcbB
zbEJ>d&isd-!f&p8*QVy5F~|NRGj4B~vOVAUwu_cEYxV;vYp!t-NczlE@X0)ec1<q4
OVC9V!jx|2Q1?vx=usvx2

diff --git a/module/CLI/lang/es.po b/module/CLI/lang/es.po
index 0f84f96d..2af67aaa 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:40+0200\n"
-"PO-Revision-Date: 2016-07-21 15:41+0200\n"
+"POT-Creation-Date: 2016-07-21 15:48+0200\n"
+"PO-Revision-Date: 2016-07-21 15:49+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es_ES\n"
@@ -96,3 +96,19 @@ msgstr "Has alcanzado la última página"
 
 msgid "Continue with page"
 msgstr "Continuar con la página"
+
+msgid "Processes visits where location is not set yet"
+msgstr "Procesa las visitas donde la localización no ha sido establecida aún"
+
+msgid "Processing IP"
+msgstr "Procesando IP"
+
+msgid "Ignored localhost address"
+msgstr "Ignorada IP de localhost"
+
+#, php-format
+msgid "Address located at \"%s\""
+msgstr "Dirección localizada en \"%s\""
+
+msgid "Finished processing all IPs"
+msgstr "Finalizado el procesado de todas las IPs"
diff --git a/module/CLI/src/Command/ProcessVisitsCommand.php b/module/CLI/src/Command/ProcessVisitsCommand.php
index 19692e85..e9f95a7b 100644
--- a/module/CLI/src/Command/ProcessVisitsCommand.php
+++ b/module/CLI/src/Command/ProcessVisitsCommand.php
@@ -11,6 +11,7 @@ use Shlinkio\Shlink\Core\Service\VisitServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Zend\I18n\Translator\TranslatorInterface;
 
 class ProcessVisitsCommand extends Command
 {
@@ -24,25 +25,36 @@ class ProcessVisitsCommand extends Command
      * @var IpLocationResolverInterface
      */
     private $ipLocationResolver;
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
 
     /**
      * ProcessVisitsCommand constructor.
      * @param VisitServiceInterface|VisitService $visitService
      * @param IpLocationResolverInterface|IpLocationResolver $ipLocationResolver
+     * @param TranslatorInterface $translator
      *
-     * @Inject({VisitService::class, IpLocationResolver::class})
+     * @Inject({VisitService::class, IpLocationResolver::class, "translator"})
      */
-    public function __construct(VisitServiceInterface $visitService, IpLocationResolverInterface $ipLocationResolver)
-    {
-        parent::__construct(null);
+    public function __construct(
+        VisitServiceInterface $visitService,
+        IpLocationResolverInterface $ipLocationResolver,
+        TranslatorInterface $translator
+    ) {
         $this->visitService = $visitService;
         $this->ipLocationResolver = $ipLocationResolver;
+        $this->translator = $translator;
+        parent::__construct(null);
     }
 
     public function configure()
     {
         $this->setName('visit:process')
-             ->setDescription('Processes visits where location is not set already');
+             ->setDescription(
+                 $this->translator->translate('Processes visits where location is not set yet')
+             );
     }
 
     public function execute(InputInterface $input, OutputInterface $output)
@@ -51,9 +63,11 @@ class ProcessVisitsCommand extends Command
 
         foreach ($visits as $visit) {
             $ipAddr = $visit->getRemoteAddr();
-            $output->write(sprintf('Processing IP <info>%s</info>', $ipAddr));
+            $output->write(sprintf('%s <info>%s</info>', $this->translator->translate('Processing IP'), $ipAddr));
             if ($ipAddr === self::LOCALHOST) {
-                $output->writeln(' (<comment>Ignored localhost address</comment>)');
+                $output->writeln(
+                    sprintf(' (<comment>%s</comment>)', $this->translator->translate('Ignored localhost address'))
+                );
                 continue;
             }
 
@@ -63,12 +77,15 @@ class ProcessVisitsCommand extends Command
                 $location->exchangeArray($result);
                 $visit->setVisitLocation($location);
                 $this->visitService->saveVisit($visit);
-                $output->writeln(sprintf(' (Address located at "%s")', $location->getCityName()));
+                $output->writeln(sprintf(
+                    ' (' . $this->translator->translate('Address located at "%s"') . ')',
+                    $location->getCityName()
+                ));
             } catch (WrongIpException $e) {
                 continue;
             }
         }
 
-        $output->writeln('Finished processing all IPs');
+        $output->writeln($this->translator->translate('Finished processing all IPs'));
     }
 }