Merge branch 'release-1.2.5'

Rudloff · Jan 20, 2019 · aa04d77 · aa04d77
2 parents 4aabbd1 + c1a16dc
commit aa04d77
Show file tree

Hide file tree

Showing 16 changed files with 405 additions and 107 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -90,7 +90,8 @@ module.exports = function (grunt) {
                         'i18n/zh_CN/LC_MESSAGES/Alltube.mo': 'i18n/zh_CN/LC_MESSAGES/Alltube.po',
                         'i18n/es_ES/LC_MESSAGES/Alltube.mo': 'i18n/es_ES/LC_MESSAGES/Alltube.po',
                         'i18n/de_DE/LC_MESSAGES/Alltube.mo': 'i18n/de_DE/LC_MESSAGES/Alltube.po',
-                        'i18n/pt_BR/LC_MESSAGES/Alltube.mo': 'i18n/pt_BR/LC_MESSAGES/Alltube.po'
+                        'i18n/pt_BR/LC_MESSAGES/Alltube.mo': 'i18n/pt_BR/LC_MESSAGES/Alltube.po',
+                        'i18n/ar_001/LC_MESSAGES/Alltube.mo': 'i18n/ar_001/LC_MESSAGES/Alltube.po'
                     }
                 }
             },

diff --git a/README.md b/README.md
@@ -196,5 +196,3 @@ Please read the [FAQ](resources/FAQ.md) before reporting any issue.
 ## License
 
 This software is available under the [GNU General Public License](http://www.gnu.org/licenses/gpl.html).
-
-Please __use a different name and logo__ if you run it on a public server.
diff --git a/classes/Config.php b/classes/Config.php
@@ -112,6 +112,13 @@ class Config
      */
     public $avconvVerbosity = 'error';
 
+    /**
+     * App name.
+     *
+     * @var string
+     */
+    public $appName = 'AllTube Download';
+
     /**
      * YAML config file path.
      *

diff --git a/classes/LocaleManager.php b/classes/LocaleManager.php
@@ -19,7 +19,7 @@ class LocaleManager
      *
      * @var array
      */
-    private $supportedLocales = ['en_US', 'fr_FR', 'zh_CN', 'es_ES', 'pt_BR', 'de_DE'];
+    private $supportedLocales = ['en_US', 'fr_FR', 'zh_CN', 'es_ES', 'pt_BR', 'de_DE', 'ar_001'];
 
     /**
      * Current locale.

diff --git a/composer.json b/composer.json
@@ -5,25 +5,25 @@
   "homepage": "http://alltubedownload.net/",
   "type": "project",
   "require": {
-    "slim/slim": "~3.9.2",
+    "slim/slim": "~3.11.0",
     "mathmarques/smarty-view": "~1.1.0",
     "symfony/yaml": "~3.4.1",
     "symfony/process": "~3.4.1",
     "guzzlehttp/guzzle": "~6.3.0",
     "aura/session": "~2.1.0",
     "barracudanetworks/archivestream-php": "~1.0.5",
-    "smarty-gettext/smarty-gettext": "~1.5.1",
+    "smarty-gettext/smarty-gettext": "~1.6.0",
     "zonuexe/http-accept-language": "~0.4.1",
-    "rinvex/country": "~3.1.0",
-    "php-mock/php-mock-mockery": "~1.2.0"
+    "rinvex/countries": "~3.1.0",
+    "php-mock/php-mock-mockery": "~1.3.0"
   },
   "require-dev": {
     "symfony/var-dumper": "~3.4.1",
-    "squizlabs/php_codesniffer": "~3.2.2",
+    "squizlabs/php_codesniffer": "~3.4.0",
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
     "ffmpeg/ffmpeg": "4.0.3",
-    "rg3/youtube-dl": "2018.11.07",
+    "rg3/youtube-dl": "2019.01.17",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1"
   },
@@ -39,10 +39,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2018.11.07",
+        "version": "2019.01.17",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2018.11.07.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2019.01.17.zip"
         }
       }
     },