Merge pull request #117 from cb8/transchoice

nicolasmure · web-flow · commit d8464f1f0e0b · 2019-04-19T12:01:52.000+02:00
Use transChoice for Symfony &lt;4.2
diff --git a/DateTimeFormatter.php b/DateTimeFormatter.php
@@ -79,7 +79,12 @@ protected function doGetDiffMessage($count, $invert, $unit)
     {
         $id = sprintf('diff.%s.%s', $invert ? 'ago' : 'in', $unit);
 
-        return $this->translator->trans($id, array('%count%' => $count), 'time');
+        // check for Symfony >= 4.2
+        if (class_exists('Symfony\Component\Translation\Formatter\IntlFormatter')) {
+            return $this->translator->trans($id, array('%count%' => $count), 'time');
+        } else {
+            return $this->translator->transChoice($id, $count, array('%count%' => $count), 'time');
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,12 @@ protected function doGetDiffMessage($count, $invert, $unit)`
`79`	`79`	`{`
`80`	`80`	`$id = sprintf('diff.%s.%s', $invert ? 'ago' : 'in', $unit);`
`81`	`81`
`82`		`- return $this->translator->trans($id, array('%count%' => $count), 'time');`
	`82`	`+ // check for Symfony >= 4.2`
	`83`	`+ if (class_exists('Symfony\Component\Translation\Formatter\IntlFormatter')) {`
	`84`	`+ return $this->translator->trans($id, array('%count%' => $count), 'time');`
	`85`	`+ } else {`
	`86`	`+ return $this->translator->transChoice($id, $count, array('%count%' => $count), 'time');`
	`87`	`+ }`
`83`	`88`	`}`
`84`	`89`
`85`	`90`	`/**`