Merge branch 'release-3.0.0-beta5'

Rudloff · Dec 17, 2020 · c9aa41d · c9aa41d
2 parents f6d3a72 + a5bda1d
commit c9aa41d
Show file tree

Hide file tree

Showing 12 changed files with 121 additions and 50 deletions.
diff --git a/classes/Controller/FrontController.php b/classes/Controller/FrontController.php
@@ -60,7 +60,7 @@ public function index(Request $request, Response $response)
             [
                 'class' => 'index',
                 'description' => $this->localeManager->t(
-                    'Easily download videos from Youtube, Dailymotion, Vimeo and other websites.'
+                    'Easily download videos from YouTube, Dailymotion, Vimeo and other websites.'
                 ),
                 'supportedLocales' => $this->localeManager->getSupportedLocales(),
             ]
@@ -103,7 +103,7 @@ public function extractors(Request $request, Response $response)
                 'extractors' => $this->downloader->getExtractors(),
                 'class' => 'extractors',
                 'title' => $this->localeManager->t('Supported websites'),
-                'description' => $this->localeManager->t('List of all supported websites from which Alltube Download ' .
+                'description' => $this->localeManager->t('List of all supported websites from which AllTube Download ' .
                     'can extract video or audio files'),
             ]
         );
@@ -128,7 +128,7 @@ public function password(Request $request, Response $response)
                 'class' => 'password',
                 'title' => $this->localeManager->t('Password prompt'),
                 'description' => $this->localeManager->t(
-                    'You need a password in order to download this video with Alltube Download'
+                    'You need a password in order to download this video with AllTube Download'
                 ),
             ]
         );

diff --git a/classes/Factory/ViewFactory.php b/classes/Factory/ViewFactory.php
@@ -81,7 +81,7 @@ public static function create(ContainerInterface $container, Request $request =
         $view->registerPlugin('block', 't', [$localeManager, 'smartyTranslate']);
 
         $view->offsetSet('canonical', self::getCanonicalUrl($request));
-        $view->offsetSet('locale', $container->get('locale')->getLocale());
+        $view->offsetSet('locale', $container->get('locale'));
         $view->offsetSet('config', $container->get('config'));
         $view->offsetSet('domain', $uri->withBasePath('')->getBaseUrl());
 

diff --git a/classes/Robo/Plugin/Commands/ReleaseCommand.php b/classes/Robo/Plugin/Commands/ReleaseCommand.php
@@ -28,11 +28,10 @@ public function release()
         $result = $gitTask
             ->arg('describe')
             ->run();
-        $result->provideOutputdata();
 
         $tmpDir = $this->_tmpDir();
 
-        $filename = 'alltube-' . trim((string)$result->getOutputData()) . '.zip';
+        $filename = 'alltube-' . trim((string)$result->getMessage()) . '.zip';
 
         /** @var FilesystemStack $rmTask */
         $rmTask = $this->taskFilesystemStack();

diff --git a/composer.json b/composer.json
@@ -36,15 +36,15 @@
     "symfony/translation": "^4.0",
     "symfony/yaml": "^4.0",
     "webfontkit/open-sans": "^1.0",
-    "ytdl-org/youtube-dl": "2020.11.01.1",
+    "ytdl-org/youtube-dl": "^2020.11",
     "zonuexe/http-accept-language": "^0.4.1"
   },
   "require-dev": {
     "consolidation/robo": "^2.1",
     "ergebnis/composer-normalize": "^2.6",
-    "insite/composer-dangling-locked-deps": "^0.2.0",
+    "insite/composer-dangling-locked-deps": "^0.2.1",
     "php-mock/php-mock-mockery": "^1.3",
-    "phpro/grumphp": "^1.0",
+    "phpro/grumphp": "^1.1",
     "phpstan/phpstan": "^0.12.25",
     "phpunit/phpunit": "^8.4",
     "sensiolabs/security-checker": "^6.0",
@@ -87,10 +87,10 @@
       "type": "package",
       "package": {
         "name": "ytdl-org/youtube-dl",
-        "version": "2020.11.01.1",
+        "version": "2020.11.12",
         "dist": {
-          "type": "tar",
-          "url": "https://files.pythonhosted.org/packages/2d/70/bd9ec7f14efab2811fc4bd39cd586ed5e292547552310ee863ff84fa7791/youtube_dl-2020.11.1.1.tar.gz"
+          "type": "zip",
+          "url": "https://github.com/ytdl-org/youtube-dl/archive/2020.11.12.zip"
         }
       }
     }

diff --git a/composer.lock b/composer.lock
diff --git a/i18n/fr_FR/LC_MESSAGES/Alltube.po b/i18n/fr_FR/LC_MESSAGES/Alltube.po
@@ -69,8 +69,8 @@ msgid "Video password"
 msgstr "Mot de passe de la vidéo"
 
 #: templates/index.tpl:8
-msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)"
-msgstr "Copiez ici l'URL de votre vidéo (Youtube, Dailymotion, etc.)"
+msgid "Copy here the URL of your video (YouTube, Dailymotion, etc.)"
+msgstr "Copiez ici l'URL de votre vidéo (YouTube, Dailymotion, etc.)"
 
 #: templates/index.tpl:25
 msgid "Audio only (MP3)"
@@ -219,17 +219,17 @@ msgstr "Impossible de trouver l'URL de la vidéo."
 
 #: controllers/FrontController.php:64
 msgid ""
-"Easily download videos from Youtube, Dailymotion, Vimeo and other websites."
+"Easily download videos from YouTube, Dailymotion, Vimeo and other websites."
 msgstr ""
-"Téléchargez facilement des vidéos depuis Youtube, Dailymotion, Vimeo et "
+"Téléchargez facilement des vidéos depuis YouTube, Dailymotion, Vimeo et "
 "d'autres sites web."
 
 #: controllers/FrontController.php:110
 msgid ""
-"List of all supported websites from which Alltube Download can extract video "
+"List of all supported websites from which AllTube Download can extract video "
 "or audio files"
 msgstr ""
-"Liste de tous les sites web depuis lesquels Alltube Download peut extraire "
+"Liste de tous les sites web depuis lesquels AllTube Download peut extraire "
 "des fichiers vidéo ou audio"
 
 #: controllers/FrontController.php:136
@@ -238,9 +238,9 @@ msgstr "Demande de mot de passe"
 
 #: controllers/FrontController.php:138
 msgid ""
-"You need a password in order to download this video with Alltube Download"
+"You need a password in order to download this video with AllTube Download"
 msgstr ""
-"Vous avez besoin d'un mot de passe pour télécharger cette vidéo avec Alltube "
+"Vous avez besoin d'un mot de passe pour télécharger cette vidéo avec AllTube "
 "Download"
 
 #: controllers/FrontController.php:169

diff --git a/i18n/template.pot b/i18n/template.pot
@@ -127,7 +127,7 @@ msgid "Video password"
 msgstr ""
 
 #: templates/index.tpl:8
-msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)"
+msgid "Copy here the URL of your video (YouTube, Dailymotion, etc.)"
 msgstr ""
 
 #: templates/index.tpl:25
@@ -173,12 +173,12 @@ msgstr ""
 
 #: classes/Controller/FrontController.php:65
 msgid ""
-"Easily download videos from Youtube, Dailymotion, Vimeo and other websites."
+"Easily download videos from YouTube, Dailymotion, Vimeo and other websites."
 msgstr ""
 
 #: classes/Controller/FrontController.php:112
 msgid ""
-"List of all supported websites from which Alltube Download can extract video "
+"List of all supported websites from which AllTube Download can extract video "
 "or audio files"
 msgstr ""
 
@@ -188,7 +188,7 @@ msgstr ""
 
 #: classes/Controller/FrontController.php:140
 msgid ""
-"You need a password in order to download this video with Alltube Download"
+"You need a password in order to download this video with AllTube Download"
 msgstr ""
 
 #: classes/Controller/FrontController.php:174