Merge pull request coduo#41 from sam002/master

Add russian. Add prefix at format difference.

Author: Norbert Orzechowicz

README.md

@@ -210,6 +210,7 @@ Currently we support following languages:
 * [Português - Brasil](src/Coduo/PHPHumanizer/Resources/translations/difference.pt_BR.yml)
 * [Italian](src/Coduo/PHPHumanizer/Resources/translations/difference.it.yml)
 * [Dutch](src/Coduo/PHPHumanizer/Resources/translations/difference.nl.yml)
+* [Русский](src/Coduo/PHPHumanizer/Resources/translations/difference.ru.yml)
 * [Norwegian](src/Coduo/PHPHumanizer/Resources/translations/difference.no.yml)
 * [Afrikaans] (src/Coduo/PHPHumanizer/Resources/translations/difference.af.yml)
 * [Bulgarian] (src/Coduo/PHPHumanizer/Resources/translations/difference.bg.yml)

spec/Coduo/PHPHumanizer/DateTime/PreciseFormatterSpec.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace spec\Coduo\PHPHumanizer\DateTime;
+
+use Coduo\PHPHumanizer\DateTime\PreciseDifference;
+use Coduo\PHPHumanizer\DateTime\Difference\CompoundResult;
+use Coduo\PHPHumanizer\DateTime\Unit\Day;
+use Coduo\PHPHumanizer\DateTime\Unit\Hour;
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+use Symfony\Component\Translation\Translator;
+
+class PreciseFormatterSpec extends ObjectBehavior
+{
+    function let(Translator $translator)
+    {
+        $this->beConstructedWith($translator);
+        $translator->transChoice(
+            'compound.day',
+            10,
+            array('%count%' => 10),
+            'difference',
+            'en'
+        )->willReturn('10 days');
+
+        $translator->transChoice(
+            'compound.hour',
+            5,
+            array('%count%' => 5),
+            'difference',
+            'en'
+        )->willReturn('5 hours');
+
+        $translator->trans(
+            'compound.future',
+            array('%value%' => '10 days, 5 hours'),
+            'difference',
+            'en'
+        )->willReturn('10 days, 5 hours from now');
+
+        $translator->transChoice(
+            'compound.day',
+            10,
+            array('%count%' => 10),
+            'difference',
+            'ru'
+        )->willReturn('10 дней');
+
+        $translator->transChoice(
+            'compound.hour',
+            5,
+            array('%count%' => 5),
+            'difference',
+            'ru'
+        )->willReturn('5 часов');
+
+        $translator->trans(
+            'compound.future',
+            array('%value%' => '10 дней, 5 часов'),
+            'difference',
+            'ru'
+        )->willReturn('через 10 дней, 5 часов');
+    }
+
+    function it_format_compound_datetime_diff(PreciseDifference $diff, CompoundResult $dayResult,
+        CompoundResult $hourResult)
+    {
+        $dayResult->getUnit()->willReturn(new Day());
+        $dayResult->getQuantity()->willReturn(10);
+        $hourResult->getUnit()->willReturn(new Hour());
+        $hourResult->getQuantity()->willReturn(5);
+
+        $diff->getCompoundResults()->willReturn(array($dayResult, $hourResult));
+        $diff->isPast()->willReturn(false);
+        $this->formatDifference($diff)->shouldReturn('10 days, 5 hours from now');
+    }
+
+    function it_format_compound_datetime_diff_for_specific_locale(PreciseDifference $diff,
+        CompoundResult $dayResult, CompoundResult $hourResult)
+    {
+        $dayResult->getUnit()->willReturn(new Day());
+        $dayResult->getQuantity()->willReturn(10);
+        $hourResult->getUnit()->willReturn(new Hour());
+        $hourResult->getQuantity()->willReturn(5);
+
+        $diff->getCompoundResults()->willReturn(array($dayResult, $hourResult));
+        $diff->isPast()->willReturn(false);
+        $this->formatDifference($diff, 'ru')->shouldReturn('через 10 дней, 5 часов');
+    }
+}

src/Coduo/PHPHumanizer/DateTime/PreciseFormatter.php

@@ -31,15 +31,19 @@ public function formatDifference(PreciseDifference $difference, $locale = 'en')
 
         foreach ($difference->getCompoundResults() as $result) {
             $diff[] = $this->translator->transChoice(
-                'compound.'.$result->getUnit()->getName(),
+                'compound.' . $result->getUnit()->getName(),
                 $result->getQuantity(),
                 array('%count%' => $result->getQuantity()),
                 'difference',
                 $locale
             );
         }
-        $suffix = $difference->isPast() ? 'compound.ago' : 'compound.from_now';
 
-        return implode(', ', $diff).' '.$this->translator->trans($suffix, array(), 'difference', $locale);
+        return $this->translator->trans(
+            'compound.' . ($difference->isPast() ? 'past' : 'future'),
+            array('%value%' => implode(', ', $diff)),
+            'difference',
+            $locale
+        );
     }
 }

src/Coduo/PHPHumanizer/Resources/translations/difference.af.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% week|[2,Inf] %count% weke"
   month: "{1} %count% maand|[2,Inf] %count% maande"
   year: "{1} %count% jaar|[2,Inf] %count% jaar"
-  ago: "gelede"
-  from_now: "van nou af"
+  past: "%value% gelede"
+  future: "%value% van nou af"

src/Coduo/PHPHumanizer/Resources/translations/difference.bg.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% седмица|[2,Inf] %count% седмица"
   month: "{1} %count% месец|[2,Inf] %count% месеца"
   year: "{1} %count% година|[2,Inf] %count% години"
-  ago: "преди това"
-  from_now: "след това"
+  past: "%value% преди това"
+  future: "%value% след това"

src/Coduo/PHPHumanizer/Resources/translations/difference.de.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% Woche|[2,Inf] %count% Wochen"
   month: "{1} %count% Monat|[2,Inf] %count% Monate"
   year: "{1} %count% Jahr|[2,Inf] %count% Jahre"
-  ago: "vor"
-  from_now: "ab jetzt"
+  past: "%value% vor"
+  future: "%value% ab jetzt"

src/Coduo/PHPHumanizer/Resources/translations/difference.en.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% week|[2,Inf] %count% weeks"
   month: "{1} %count% month|[2,Inf] %count% months"
   year: "{1} %count% year|[2,Inf] %count% years"
-  ago: "ago"
-  from_now: "from now"
+  past: "%value% ago"
+  future: "%value% from now"

src/Coduo/PHPHumanizer/Resources/translations/difference.fr.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% semaine|[2,Inf] %count% semaines"
   month: "{1} %count% mois|[2,Inf] %count% mois"
   year: "{1} %count% année|[2,Inf] %count% années"
-  ago: "il y a"
-  from_now: "maintenant"
+  past: "%value% il y a"
+  future: "%value% maintenant"

src/Coduo/PHPHumanizer/Resources/translations/difference.it.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% settimana|[2,Inf] %count% settimane"
   month: "{1} %count% mese|[2,Inf] %count% mesi"
   year: "{1} %count% anno|[2,Inf] %count% anni"
-  ago: "fa"
-  from_now: "da adesso"
+  past: "%value% fa"
+  future: "%value% da adesso"

src/Coduo/PHPHumanizer/Resources/translations/difference.nl.yml

@@ -31,5 +31,5 @@ compound:
   week: "{1} %count% week|[2,Inf] %count% weken"
   month: "{1} %count% maand|[2,Inf] %count% maanden"
   year: "{1} %count% jaar|[2,Inf] %count% jaren"
-  ago: "geleden"
-  from_now: "vanaf nu"
+  past: "%value% geleden"
+  future: "%value% vanaf nu"