Merge branch 'master' into develop

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"
     },

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'),
             ];
         }