kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 11:48:53 +00:00
Code Issues Projects Releases Wiki Activity

A set of small fixes, courtesy of scrutinizer-ci

Browse Source
This commit is contained in:
James Cole
2016-01-27 19:35:00 +01:00
parent 9155c13e08
commit 28fdad9426
12 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Controller.php
View File

@@ -22,9 +22,9 @@ class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
/** @var string|\Symfony\Component\Translation\TranslatorInterface */
/** @var string */
protected $monthAndDayFormat;
/** @var string|\Symfony\Component\Translation\TranslatorInterface */
/** @var string */
protected $monthFormat;
/**
@@ -40,8 +40,8 @@ class Controller extends BaseController
if (Auth::check()) {
$pref = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'));
$lang = $pref->data;
$this->monthFormat = trans('config.month');
$this->monthAndDayFormat = trans('config.month_and_day');
$this->monthFormat = (string)trans('config.month');
$this->monthAndDayFormat = (string)trans('config.month_and_day');
App::setLocale($lang);
Carbon::setLocale(substr($lang, 0, 2));