Skip to content

Use message selector for untranslated plural messages #105

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

Closed
matejg wants to merge 6 commits into from
Closed

Use message selector for untranslated plural messages #105

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c467445
Use message selector for untranslated messages
matejg Apr 15, 2016
3108f99
fix whitespace
matejg Apr 15, 2016
4c0edab
add check for empty locale
matejg Apr 15, 2016
6af3fad
fix whitespaces
matejg Apr 18, 2016
42fa986
fix whitespaces
matejg Apr 18, 2016
a7e5584
Merge branch 'master' into matejg-patch-1
matejg Apr 20, 2016
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
12 changes: 10 additions & 2 deletions src/Kdyby/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ class Translator extends BaseTranslator implements ITranslator
*/
private $localeWhitelist;


/**
* @var MessageSelector
*/
private $selector;

/**
* @param IUserLocaleResolver $localeResolver
Expand All @@ -88,6 +91,7 @@ public function __construct(IUserLocaleResolver $localeResolver, MessageSelector
CatalogueCompiler $catalogueCompiler, FallbackResolver $fallbackResolver, IResourceLoader $loader)
{
$this->localeResolver = $localeResolver;
$this->selector = $selector;
$this->catalogueCompiler = $catalogueCompiler;
$this->fallbackResolver = $fallbackResolver;
$this->translationsLoader = $loader;
Expand Down Expand Up @@ -228,7 +232,11 @@ public function transChoice($message, $number, array $parameters = [], $domain =
if ($this->panel !== NULL) {
$this->panel->markUntranslated($message, $domain);
}
$result = strtr($message, $parameters);

if ($locale === NULL) {
$locale = $this->getLocale();
}
$result = strtr($this->selector->choose($message, (int) $number, $locale), $parameters);
}

return $result;
Expand Down