Skip to content

Commit

Permalink
Use message selector for untranslated messages
Browse files Browse the repository at this point in the history
[Closes #105]
  • Loading branch information
matejg authored and fprochazka committed May 15, 2017
1 parent 01951f8 commit 468ae15
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/Kdyby/Translation/Translator.php
Expand Up @@ -76,7 +76,10 @@ class Translator extends BaseTranslator implements ITranslator
*/
private $localeWhitelist;


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

/**
* @param IUserLocaleResolver $localeResolver
Expand All @@ -89,6 +92,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 @@ -233,7 +237,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

0 comments on commit 468ae15

Please sign in to comment.