diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for multiple formatters

Browse Source
This commit is contained in:
Nyholm 2018-05-28 21:09:26 +02:00
parent c2b3dc0a90
commit b43fe21997
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
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
class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
{
/**
* {@inheritdoc}
@ -34,4 +34,12 @@ class IntlMessageFormatter implements MessageFormatterInterface
return $message;
}
/**
* {@inheritdoc}
*/
public function choiceFormat($message, $number, $locale, array $parameters = array())
{
return $this->format($message, $locale, $parameters);
}
}

37
src/Symfony/Component/Translation/Translator.php
View File

@ -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 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
$formatter = new MessageFormatter();
}
$this->formatter = $formatter;
$this->formatters['default'] = $formatter;
$this->cacheDir = $cacheDir;
$this->debug = $debug;
}
@ -137,6 +137,15 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
}
}
/**
* @param string $domain
* @param MessageFormatterInterface $formatter
*/
public function addFormatter(string $domain, MessageFormatterInterface $formatter)
{
$this->formatters[$domain] = $formatter;
}
/**
* {@inheritdoc}
*/
@ -192,7 +201,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
$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 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
$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 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
}
}
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 @@ EOF
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'];
}
}