PrivateCoffee/alltube
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pierre Rudloff 2019-11-29 23:02:52 +01:00
commit a6ed0498cb
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app.json
View file

@ -11,12 +11,6 @@
"php" "php"
], ],
"buildpacks": [ "buildpacks": [
{
"url": "https://github.com/heroku/heroku-buildpack-locale"
},
{
"url": "https://github.com/piotras/heroku-buildpack-gettext.git"
},
{ {
"url": "heroku/php" "url": "heroku/php"
}, },

7
classes/Config.php
View file

@ -151,13 +151,14 @@ class Config
{ {
$this->applyOptions($options); $this->applyOptions($options);
$this->getEnv(); $this->getEnv();
$localeManager = LocaleManager::getInstance();
if (empty($this->genericFormats)) { if (empty($this->genericFormats)) {
// We don't put this in the class definition so it can be detected by xgettext. // We don't put this in the class definition so it can be detected by xgettext.
$this->genericFormats = [ $this->genericFormats = [
'best' => _('Best'), 'best' => $localeManager->t('Best'),
'bestvideo+bestaudio' => _('Remux best video with best audio'), 'bestvideo+bestaudio' => $localeManager->t('Remux best video with best audio'),
'worst' => _('Worst'), 'worst' => $localeManager->t('Worst'),
]; ];
} }