kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 20:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix summary and dates, also fix #5770

Browse Source
This commit is contained in:
James Cole
2022-03-28 12:24:16 +02:00
parent f2849c8058
commit abb1095cef
9 changed files with 114 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Chart/Budget/FrontpageChartGenerator.php
View File

@@ -229,6 +229,6 @@ class FrontpageChartGenerator
$this->opsRepository->setUser($user);
$locale = app('steam')->getLocale();
$this->monthAndDayFormat = (string)trans('config.month_and_day', [], $locale);
$this->monthAndDayFormat = (string)trans('config.month_and_day_js', [], $locale);
}
}

2
app/Support/Http/Controllers/PeriodOverview.php
View File

@@ -93,7 +93,7 @@ trait PeriodOverview
$cache->addProperty('account-show-period-entries');
$cache->addProperty($account->id);
if ($cache->has()) {
return $cache->get();
// return $cache->get();
}
/** @var array $dates */
$dates = app('navigation')->blockPeriods($start, $end, $range);

32
app/Support/Navigation.php
View File

@@ -340,17 +340,17 @@ class Navigation
// define period to increment
$increment = 'addDay';
$format = $this->preferredCarbonFormat($start, $end);
$displayFormat = (string)trans('config.month_and_day', [], $locale);
$displayFormat = (string)trans('config.month_and_day_js', [], $locale);
// increment by month (for year)
if ($start->diffInMonths($end) > 1) {
$increment = 'addMonth';
$displayFormat = (string)trans('config.month');
$displayFormat = (string)trans('config.month_js');
}
// increment by year (for multi year)
if ($start->diffInMonths($end) > 12) {
$increment = 'addYear';
$displayFormat = (string)trans('config.year');
$displayFormat = (string)trans('config.year_js');
}
$begin = clone $start;
$entries = [];
@@ -397,19 +397,19 @@ class Navigation
{
$date = clone $theDate;
$formatMap = [
'1D' => (string)trans('config.specific_day'),
'daily' => (string)trans('config.specific_day'),
'custom' => (string)trans('config.specific_day'),
'1W' => (string)trans('config.week_in_year'),
'week' => (string)trans('config.week_in_year'),
'weekly' => (string)trans('config.week_in_year'),
'1M' => (string)trans('config.month'),
'month' => (string)trans('config.month'),
'monthly' => (string)trans('config.month'),
'1Y' => (string)trans('config.year'),
'year' => (string)trans('config.year'),
'yearly' => (string)trans('config.year'),
'6M' => (string)trans('config.half_year'),
'1D' => (string)trans('config.specific_day_js'),
'daily' => (string)trans('config.specific_day_js'),
'custom' => (string)trans('config.specific_day_js'),
'1W' => (string)trans('config.week_in_year_js'),
'week' => (string)trans('config.week_in_year_js'),
'weekly' => (string)trans('config.week_in_year_js'),
'1M' => (string)trans('config.month_js'),
'month' => (string)trans('config.month_js'),
'monthly' => (string)trans('config.month_js'),
'1Y' => (string)trans('config.year_js'),
'year' => (string)trans('config.year_js'),
'yearly' => (string)trans('config.year_js'),
'6M' => (string)trans('config.half_year_js'),
];
if (array_key_exists($repeatFrequency, $formatMap)) {