kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/8776

Browse Source
This commit is contained in:
James Cole
2024-04-20 08:15:17 +02:00
parent 96fe62400f
commit 850e47d8db
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Navigation.php
View File

@@ -465,13 +465,13 @@ class Navigation
$format = $this->preferredCarbonFormat($start, $end); $format = $this->preferredCarbonFormat($start, $end);
$displayFormat = (string)trans('config.month_and_day_js', [], $locale); $displayFormat = (string)trans('config.month_and_day_js', [], $locale);
// increment by month (for year) // increment by month (for year)
if ($start->diffInMonths($end, true) > 1) { if ($start->diffInMonths($end, true) > 1.0) {
$increment = 'addMonth'; $increment = 'addMonth';
$displayFormat = (string)trans('config.month_js'); $displayFormat = (string)trans('config.month_js');
} }
// increment by year (for multi-year) // increment by year (for multi-year)
if ($start->diffInMonths($end, true) > 12) { if ($start->diffInMonths($end, true) > 12.0) {
$increment = 'addYear'; $increment = 'addYear';
$displayFormat = (string)trans('config.year_js'); $displayFormat = (string)trans('config.year_js');
} }
@@ -494,11 +494,11 @@ class Navigation
public function preferredCarbonFormat(Carbon $start, Carbon $end): string public function preferredCarbonFormat(Carbon $start, Carbon $end): string
{ {
$format = 'Y-m-d'; $format = 'Y-m-d';
if ((int)$start->diffInMonths($end, true) > 1) { if ($start->diffInMonths($end, true) > 1.0) {
$format = 'Y-m'; $format = 'Y-m';
} }
if ((int)$start->diffInMonths($end, true) > 12) { if ($start->diffInMonths($end, true) > 12.0) {
$format = 'Y'; $format = 'Y';
} }