Fixes according to feedback

This commit is contained in:
Nyholm 2018-09-03 23:09:46 +02:00
parent a325a443ed
commit 2aa7181e15
2 changed files with 2 additions and 14 deletions

View File

@ -15,7 +15,7 @@ namespace Symfony\Component\Translation\Formatter;
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
*/
class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
class IntlMessageFormatter implements MessageFormatterInterface
{
/**
* {@inheritdoc}
@ -38,12 +38,4 @@ class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFo
return $message;
}
/**
* {@inheritdoc}
*/
public function choiceFormat($message, $number, $locale, array $parameters = array())
{
return $this->format($message, $locale, $parameters);
}
}

View File

@ -205,17 +205,13 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
*/
public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
{
if (!$this->formatter instanceof ChoiceMessageFormatterInterface) {
throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($this->formatter)));
}
if (null === $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)));
throw new LogicException(sprintf('The formatter "%s" does not support plural translations.', \get_class($formatter)));
}
$id = (string) $id;