genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for variables in translation (#250)

Browse source
This commit is contained in:
Pierre Rudloff 2019-11-29 21:33:49 +01:00
parent 6fb1cbaa6c
commit 850fc80622
8 changed files with 145 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

10
classes/LocaleManager.php
View file

@ -140,7 +140,11 @@ class LocaleManager
*/
public function smartyTranslate(array $params, $text)
{
return $this->t($text);
if (isset($params['params'])) {
return $this->t($text, $params['params']);
} else {
return $this->t($text);
}
}
/**
@ -150,9 +154,9 @@ class LocaleManager
*
* @return string Translated string
*/
public function t($string)
public function t($string, array $params = [])
{
return $this->translator->trans($string);
return $this->translator->trans($string, $params);
}
/**

14
classes/Video.php
View file

@ -358,8 +358,9 @@ class Video
if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(
$this->localeManager->t(
'Can\'t find avconv or ffmpeg at '
) . $this->config->avconv . '.'
"Can't find avconv or ffmpeg at @path.",
['@path' => $this->config->avconv]
)
);
}
@ -373,14 +374,14 @@ class Video
if (!empty($from)) {
if (!preg_match($durationRegex, $from)) {
throw new Exception($this->localeManager->t('Invalid start time: ') . $from . '.');
throw new Exception($this->localeManager->t('Invalid start time: @from.', ['@from' => $from]));
}
$afterArguments[] = '-ss';
$afterArguments[] = $from;
}
if (!empty($to)) {
if (!preg_match($durationRegex, $to)) {
throw new Exception($this->localeManager->t('Invalid end time: ') . $to . '.');
throw new Exception($this->localeManager->t('Invalid end time: @to.', ['@to' => $to]));
}
$afterArguments[] = '-to';
$afterArguments[] = $to;
@ -461,8 +462,9 @@ class Video
if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(
$this->localeManager->t(
'Can\'t find avconv or ffmpeg at '
) . $this->config->avconv . '.'
"Can't find avconv or ffmpeg at @path.",
['@path' => $this->config->avconv]
)
);
}