From cc55fabe14f62cb297c3740831ea7d1a796873b1 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Fri, 29 Nov 2019 22:56:41 +0100 Subject: [PATCH 1/2] Remove remaining gettext functions --- classes/Config.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/classes/Config.php b/classes/Config.php index e4454dc..0da9ada 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -151,13 +151,14 @@ class Config { $this->applyOptions($options); $this->getEnv(); + $localeManager = LocaleManager::getInstance(); if (empty($this->genericFormats)) { // We don't put this in the class definition so it can be detected by xgettext. $this->genericFormats = [ - 'best' => _('Best'), - 'bestvideo+bestaudio' => _('Remux best video with best audio'), - 'worst' => _('Worst'), + 'best' => $localeManager->t('Best'), + 'bestvideo+bestaudio' => $localeManager->t('Remux best video with best audio'), + 'worst' => $localeManager->t('Worst'), ]; } From fe4df10cd2e45724241abdbb017c44249906ba2f Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Fri, 29 Nov 2019 22:59:51 +0100 Subject: [PATCH 2/2] We don't need gettext on Heroku anymore --- app.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app.json b/app.json index edc1929..8974400 100644 --- a/app.json +++ b/app.json @@ -11,12 +11,6 @@ "php" ], "buildpacks": [ - { - "url": "https://github.com/heroku/heroku-buildpack-locale" - }, - { - "url": "https://github.com/piotras/heroku-buildpack-gettext.git" - }, { "url": "heroku/php" },