kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

All new translations for #218

Browse Source
This commit is contained in:
James Cole
2016-03-20 11:38:01 +01:00
parent 935d72d672
commit 7e67eb17e0
15 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ProfileController.php
View File

@@ -60,7 +60,7 @@ class ProfileController extends Controller
{
// old, new1, new2
if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
Session::flash('error', trans('firefly.invalid_current_password'));
Session::flash('error', strval(trans('firefly.invalid_current_password')));
return redirect(route('profile.change-password'));
}
@@ -75,7 +75,7 @@ class ProfileController extends Controller
Auth::user()->password = bcrypt($request->get('new_password'));
Auth::user()->save();
Session::flash('success', trans('firefly.password_changed'));
Session::flash('success', strval(trans('firefly.password_changed')));
return redirect(route('profile'));
}
@@ -90,7 +90,7 @@ class ProfileController extends Controller
{
// old, new1, new2
if (!Hash::check($request->get('password'), Auth::user()->password)) {
Session::flash('error', trans('firefly.invalid_password'));
Session::flash('error', strval(trans('firefly.invalid_password')));
return redirect(route('profile.delete-account'));
}