8000 [Translation] Added intl message formatter. by Nyholm · Pull Request #27399 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Translation] Added intl message formatter. #27399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 4, 2018
Merged

[Translation] Added intl message formatter. #27399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
940d440
Make it a warning
Nyholm Jun 7, 2018
19e8e69
use error
Nyholm Jun 7, 2018
c2b3dc0
[Translation] Added intl message formatter.
aitboudad Sep 19, 2016
b43fe21
Add support for multiple formatters
Nyholm May 28, 2018
a325a44
Allow config for different domain specific formatters
Nyholm May 28, 2018
2aa7181
Fixes according to feedback
Nyholm Sep 3, 2018
597a15d
Use FallbackFormatter instead of support for multiple formatters
Nyholm Sep 3, 2018
f88153f
Updates according to feedback
Nyholm Sep 4, 2018
b1aa004
Only use the default translator if intl extension is loaded
Nyholm Sep 4, 2018
fb30c77
Be more specific with what exception we catch
Nyholm Sep 4, 2018
2a90931
cs
Nyholm Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes according to feedback
  • Loading branch information
@Nyholm
Nyholm committed Sep 3, 2018
commit 2aa7181e151437f7b93dc9b5a60c10e65163c53c
10 changes: 1 addition & 9 deletions src/Symfony/Component/Translation/Formatter/IntlMessageFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
* @author Abdellatif Ait boudad <a.aitboudad@gmail.com>
*/
class IntlMessageFormatter implements MessageFormatterInterface, ChoiceMessageFormatterInterface
class IntlMessageFormatter implements MessageFormatterInterface
{
/**
* {@inheritdoc}
Expand All @@ -38,12 +38,4 @@ 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);
}
}
6 changes: 1 addition & 5 deletions src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,13 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
*/
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;
Expand Down
0