kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6502 from D7032E-Group-6/develop

Browse Source 
Issue #5234 fix
This commit is contained in:
James Cole
2022-10-06 06:09:51 +02:00
committed by GitHub
parent bab4c05e5f fc83565d02
commit 187e1914e3
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Http/Controllers/GetConfigurationData.php
View File

@@ -147,6 +147,16 @@ trait GetConfigurationData
$index = (string) trans('firefly.last_thirty_days');
$ranges[$index] = [$thirty, new Carbon];
// month to date:
$monthBegin = Carbon::now()->startOfMonth();
$index = (string) trans('firefly.month_to_date');
$ranges[$index] = [$monthBegin, new Carbon];
// year to date:
$yearBegin = Carbon::now()->startOfYear();
$index = (string) trans('firefly.year_to_date');
$ranges[$index] = [$yearBegin, new Carbon];
// everything
$index = (string) trans('firefly.everything');
$ranges[$index] = [$first, new Carbon];

2
resources/lang/en_US/firefly.php
View File

@@ -35,6 +35,8 @@ return [
'last_seven_days' => 'Last seven days',
'last_thirty_days' => 'Last thirty days',
'last_180_days' => 'Last 180 days',
'month_to_date' => 'Month to date',
'year_to_date' => 'Year to date',
'YTD' => 'YTD',
'welcome_back' => 'What\'s playing?',
'everything' => 'Everything',