IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #648

Browse Source
This commit is contained in:
James Cole 2017-07-29 14:25:54 +02:00
parent db3b822aef
commit eac9613df7
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AccountController.php
View File

@ -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'));
}

2
app/Http/Controllers/BudgetController.php
View File

@ -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'));

3
app/Http/Controllers/CategoryController.php
View File

@ -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'));

1
app/Http/Controllers/TagController.php
View File

@ -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'));

2
app/Http/Controllers/TransactionController.php
View File

@ -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'));

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

@ -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',