Merge branch 'master' of https://github.com/tony199555/alltube into feature/gettext

Conflicts:
	composer.json
	composer.lock
	templates/index.tpl
	templates/video.tpl
This commit is contained in:
Pierre Rudloff 2017-05-29 19:01:20 +02:00
commit 3fff849ea8
15 changed files with 368 additions and 47 deletions

View file

@ -1,5 +1,10 @@
<?php
$language = 'zh_CN';
putenv('LANG='.$language);
setlocale(LC_ALL, [$language, $language.'.utf8']);
require_once __DIR__.'/vendor/autoload.php';
use Alltube\Config;
use Alltube\Controller\FrontController;