Add support for multiple formatters

Nyholm · Nyholm · commit b43fe21997e5 · 2018-09-03T23:02:48.000+02:00
diff --git a/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php b/src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
@@ -15,7 +15,7 @@
  * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
  * @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
  */
-class IntlMessageFormatter implements MessageFormatterInterface
+class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
 {
     /**
      * {@inheritdoc}
@@ -34,4 +34,12 @@ public function format($message, $locale, array $parameters = array())
 
         return $message;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function choiceFormat($message, $number, $locale, array $parameters = array())
+    {
+        return $this->format($message, $locale, $parameters);
+    }
 }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -54,9 +54,9 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     private $resources = array();
 
     /**
-     * @var MessageFormatterInterface
+     * @var MessageFormatterInterface[]
      */
-    private $formatter;
+    private $formatters;
 
     /**
      * @var string
@@ -89,7 +89,7 @@ public function __construct(?string $locale, MessageFormatterInterface $formatte
             $formatter = new MessageFormatter();
         }
 
-        $this->formatter = $formatter;
+        $this->formatters['default'] = $formatter;
         $this->cacheDir = $cacheDir;
         $this->debug = $debug;
     }
@@ -137,6 +137,15 @@ public function addResource($format, $resource, $locale, $domain = null)
         }
     }
 
+    /**
+     * @param string $domain
+     * @param MessageFormatterInterface $formatter
+     */
+    public function addFormatter(string $domain, MessageFormatterInterface $formatter)
+    {
+        $this->formatters[$domain] = $formatter;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -192,7 +201,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
             $domain = 'messages';
         }
 
-        return $this->formatter->format($this->getCatalogue($locale)->get((string) $id, $domain), $locale, $parameters);
+        return $this->getFormatter($domain)->format($this->getCatalogue($locale)->get((string) $id, $domain), $locale, $parameters);
     }
 
     /**
@@ -208,6 +217,11 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
             $domain = 'messages';
         }
 
+        $formatter = $this->getFormatter($domain);
+        if (!$formatter instanceof ChoiceMessageFormatterInterface) {
+            throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', get_class($formatter)));
+        }
+
         $id = (string) $id;
         $catalogue = $this->getCatalogue($locale);
         $locale = $catalogue->getLocale();
@@ -220,7 +234,7 @@ public function transChoice($id, $number, array $parameters = array(), $domain =
             }
         }
 
-        return $this->formatter->choiceFormat($catalogue->get($id, $domain), $number, $locale, $parameters);
+        return $formatter->choiceFormat($catalogue->get($id, $domain), $number, $locale, $parameters);
     }
 
     /**
@@ -455,4 +469,17 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface
 
         return $this->configCacheFactory;
     }
+
+    /**
+     * @param string $domain
+     * @return MessageFormatterInterface
+     */
+    private function getFormatter(string $domain)
+    {
+        if (isset($this->formatters[$domain])) {
+            return $this->formatters[$domain];
+        }
+
+        return $this->formatters['default'];
+    }
 }
