kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-01 11:31:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge tag '4.7.17.6' into develop

Browse Source 
4.7.17.6

# Conflicts:
#	.travis.yml
#	app/Http/Controllers/Import/JobConfigurationController.php
#	app/Http/Controllers/Transaction/SingleController.php
#	config/firefly.php
This commit is contained in:
James Cole
2019-08-03 05:11:58 +02:00
parent 40dd2e0f7f 2089ee14e9
commit 43dbad4e4c
12 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PiggyBankController.php
View File

@@ -321,7 +321,7 @@ class PiggyBankController extends Controller
'error',
(string)trans(
'firefly.cannot_add_amount_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
)
);
@@ -364,7 +364,7 @@ class PiggyBankController extends Controller
'error',
(string)trans(
'firefly.cannot_remove_from_piggy',
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name]
['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)]
)
);