diff --git a/bower.json b/bower.json index 10794c7..8c7ffdb 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,6 @@ { "name": "alltube", "dependencies": { - "opensans-googlefont": "*", - "flag-icon-css": "~2.8.0" + "opensans-googlefont": "*" } } diff --git a/classes/Locale.php b/classes/Locale.php index 081e215..cf6f602 100644 --- a/classes/Locale.php +++ b/classes/Locale.php @@ -87,4 +87,9 @@ class Locale { return strtolower($this->region); } + + public function getCountry() + { + return country($this->getIso3166()); + } } diff --git a/composer.json b/composer.json index e977748..310215c 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "aura/session": "~2.1.0", "barracudanetworks/archivestream-php": "~1.0.5", "smarty-gettext/smarty-gettext": "~1.5.1", - "zonuexe/http-accept-language": "~0.4.1" + "zonuexe/http-accept-language": "~0.4.1", + "rinvex/country": "~2.0.0" }, "require-dev": { "symfony/var-dumper": "~3.2.0", diff --git a/composer.lock b/composer.lock index a4ac43a..c5368cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "44c4a3592a8eac7111a7284b22e55868", + "content-hash": "22e16312bcf339c90850660d9e5923e7", "packages": [ { "name": "aura/session", @@ -591,6 +591,80 @@ "description": "Add ability to chain symfony processes", "time": "2016-04-10T08:33:20+00:00" }, + { + "name": "rinvex/country", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/rinvex/country.git", + "reference": "9405da035644bc76671bfba0c282fef8fd3408e1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rinvex/country/zipball/9405da035644bc76671bfba0c282fef8fd3408e1", + "reference": "9405da035644bc76671bfba0c282fef8fd3408e1", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "phpunit/phpunit": "^5.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Rinvex\\Country\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Rinvex LLC", + "email": "help@rinvex.com", + "homepage": "https://rinvex.com" + }, + { + "name": "Abdelrahman Omran", + "email": "me@omranic.com", + "homepage": "https://omranic.com", + "role": "Project Lead" + }, + { + "name": "The Generous Laravel Community", + "homepage": "https://github.com/rinvex/country/contributors" + } + ], + "description": "Rinvex Country is a simple and lightweight package for retrieving country details with flexibility. A whole bunch of data including name, demonym, capital, iso codes, dialling codes, geo data, currencies, flags, emoji, and other attributes for all 250 countries worldwide at your fingertips.", + "homepage": "https://rinvex.com", + "keywords": [ + "Flexible", + "Simple", + "countries", + "country", + "currencies", + "demonym", + "dialling", + "emoji", + "flags", + "geographic", + "languages", + "rinvex", + "svg" + ], + "time": "2016-11-27T05:53:11+00:00" + }, { "name": "slim/slim", "version": "3.8.1", @@ -771,16 +845,16 @@ }, { "name": "symfony/process", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0" + "reference": "36774717bbd1631be2d0a45acf48aecd5836c867" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", - "reference": "999c2cf5061e627e6cd551dc9ebf90dd1d11d9f0", + "url": "https://api.github.com/repos/symfony/process/zipball/36774717bbd1631be2d0a45acf48aecd5836c867", + "reference": "36774717bbd1631be2d0a45acf48aecd5836c867", "shasum": "" }, "require": { @@ -816,20 +890,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-04-12T14:13:17+00:00" + "time": "2017-05-08T01:51:21+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6" + "reference": "4cdb9fec28fba88203a71f6d095018867f7a2065" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6", - "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4cdb9fec28fba88203a71f6d095018867f7a2065", + "reference": "4cdb9fec28fba88203a71f6d095018867f7a2065", "shasum": "" }, "require": { @@ -871,7 +945,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-25T23:42:36+00:00" }, { "name": "zonuexe/http-accept-language", @@ -2333,16 +2407,16 @@ }, { "name": "symfony/var-dumper", - "version": "v3.2.8", + "version": "v3.2.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8" + "reference": "eda0d0891a0b60a25015f7b85ea8040b51d72e1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", - "reference": "fa47963ac7979ddbd42b2d646d1b056bddbf7bb8", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eda0d0891a0b60a25015f7b85ea8040b51d72e1e", + "reference": "eda0d0891a0b60a25015f7b85ea8040b51d72e1e", "shasum": "" }, "require": { @@ -2397,7 +2471,7 @@ "debug", "dump" ], - "time": "2017-05-01T14:55:58+00:00" + "time": "2017-05-15T12:02:31+00:00" }, { "name": "webmozart/assert", diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl index f10d1ff..16e185f 100644 --- a/templates/inc/head.tpl +++ b/templates/inc/head.tpl @@ -10,7 +10,6 @@ {/if} - AllTube Download{if isset($title)} - {$title|escape}{/if} diff --git a/templates/inc/header.tpl b/templates/inc/header.tpl index 92066b5..688f9a7 100644 --- a/templates/inc/header.tpl +++ b/templates/inc/header.tpl @@ -7,7 +7,7 @@ {if isset($supportedLocales)} {/if}