kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-02 02:18:20 +00:00
Code Issues Projects Releases Wiki Activity

Add two new ranges #954

Browse Source
This commit is contained in:
James Cole
2018-09-06 13:05:15 +02:00
parent 03956af88a
commit 9ece209c72
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,6 +168,16 @@ trait GetConfigurationData
$ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd]; $ranges[ucfirst((string)trans('firefly.today'))] = [$todayStart, $todayEnd];
} }
// last seven days:
$seven = Carbon::create()->subDays(7);
$index = (string)trans('firefly.last_seven_days');
$ranges[$index] = [$seven, new Carbon];
// last 30 days:
$thirty = Carbon::create()->subDays(30);
$index = (string)trans('firefly.last_thirty_days');
$ranges[$index] = [$thirty, new Carbon];
// everything // everything
$index = (string)trans('firefly.everything'); $index = (string)trans('firefly.everything');
$ranges[$index] = [$first, new Carbon]; $ranges[$index] = [$first, new Carbon];
@@ -259,9 +269,10 @@ trait GetConfigurationData
$now = time(); $now = time();
if (0 === $lastTime) { if (0 === $lastTime) {
request()->session()->flash('info', trans('firefly.recurring_never_cron')); request()->session()->flash('info', trans('firefly.recurring_never_cron'));
return; return;
} }
if($now - $lastTime > 129600) { if ($now - $lastTime > 129600) {
request()->session()->flash('warning', trans('firefly.recurring_cron_long_ago')); request()->session()->flash('warning', trans('firefly.recurring_cron_long_ago'));
} }
} }

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

@@ -30,6 +30,8 @@ return [
'delete' => 'Delete', 'delete' => 'Delete',
'split' => 'Split', 'split' => 'Split',
'clone' => 'Clone', 'clone' => 'Clone',
'last_seven_days' => 'Last seven days',
'last_thirty_days' => 'Last thirty days',
'welcomeBack' => 'What\'s playing?', 'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything', 'everything' => 'Everything',
'today' => 'today', 'today' => 'today',