diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 187f623a10..441ce0f345 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -32,6 +32,7 @@ use Illuminate\Support\Collection; use Log; use Navigation; use Preferences; +use Session; use Steam; use View; @@ -317,10 +318,12 @@ class AccountController extends Controller } if ($moment !== 'all' && $loop > 1) { + $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]); $subTitle = trans( 'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index b824497308..b4df6e2a85 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -34,6 +34,7 @@ use Log; use Navigation; use Preferences; use Response; +use Session; use View; /** @@ -323,6 +324,7 @@ class BudgetController extends Controller 'firefly.without_budget_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 27ff1c92aa..8ec29fc70f 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -29,6 +29,7 @@ use Illuminate\Support\Collection; use Log; use Navigation; use Preferences; +use Session; use Steam; use View; @@ -229,6 +230,7 @@ class CategoryController extends Controller 'firefly.without_category_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } return view('categories.no-category', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); @@ -314,6 +316,7 @@ class CategoryController extends Controller ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } return view('categories.show', compact('category', 'moment', 'journals', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index fe53bfda9f..bea865e276 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -306,6 +306,7 @@ class TagController extends Controller 'firefly.journals_in_period_for_tag', ['tag' => $tag->tag, 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } return view('tags.show', compact('apiKey', 'tag', 'periods', 'subTitle', 'subTitleIcon', 'journals', 'sum', 'start', 'end', 'moment')); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 46173dd35a..7cb01a557d 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -27,6 +27,7 @@ use Log; use Navigation; use Preferences; use Response; +use Session; use Steam; use View; @@ -136,6 +137,7 @@ class TransactionController extends Controller 'firefly.title_' . $what . '_between', ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)] ); + Session::flash('info', trans('firefly.jump_back_in_time')); } return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals', 'periods', 'start', 'end', 'moment')); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 22d1acad59..816159cb07 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -145,6 +145,7 @@ return [ 'exchange_rate_instructions' => 'Asset account "@name" only accepts transactions in @native_currency. If you wish to use @foreign_currency instead, make sure that the amount in @native_currency is known as well:', 'transfer_exchange_rate_instructions' => 'Source asset account "@source_name" only accepts transactions in @source_currency. Destination asset account "@dest_name" only accepts transactions in @dest_currency. You must provide the transferred amount correctly in both currencies.', 'transaction_data' => 'Transaction data', + 'jump_back_in_time' => 'The period you selected contains no transactions. Firefly III has skipped this empty period. The dates below may divert from what you have selected.', // search 'search' => 'Search',