gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 04:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistency for #595

Browse Source
This commit is contained in:
James Cole
2017-03-10 16:08:58 +01:00
parent ef0057d88d
commit ebc712f6b5
7 changed files with 100 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/BudgetController.php
View File

@@ -215,10 +215,7 @@ class BudgetController extends Controller
if (strlen($moment) > 0 && $moment !== 'all') {
$start = new Carbon($moment);
$end = Navigation::endOfPeriod($start, $range);
$subTitle = trans(
'firefly.without_budget_between',
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
);
$subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]);
$periods = $this->noBudgetPeriodEntries();
}
@@ -257,7 +254,12 @@ class BudgetController extends Controller
}
}
return view('budgets.no-budget', compact('journals', 'subTitle', 'periods', 'start', 'end'));
// fix title:
if ((strlen($moment) > 0 && $moment !== 'all') || strlen($moment) === 0) {
$subTitle = trans('firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]);
}
return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end'));
}
/**