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

Page titles.

Browse Source
This commit is contained in:
James Cole 2016-04-03 10:34:42 +02:00
parent ad402021ed
commit 697a02ffee
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Csv/Importer.php
View File

@ -120,6 +120,8 @@ class Importer
Log::error('Caught error at row #' . $index . ': ' . $result); Log::error('Caught error at row #' . $index . ': ' . $result);
$this->errors[$index] = $result; $this->errors[$index] = $result;
} else { } else {
$this->imported++; $this->imported++;
$this->journals->push($result); $this->journals->push($result);
} }

6
app/Http/Controllers/Auth/TwoFactorController.php
View File

@ -37,13 +37,14 @@ class TwoFactorController extends Controller
// to make sure the validator in the next step gets the secret, we push it in session // to make sure the validator in the next step gets the secret, we push it in session
$secret = Preferences::get('twoFactorAuthSecret', '')->data; $secret = Preferences::get('twoFactorAuthSecret', '')->data;
$title = strval(trans('firefly.two_factor_title'));
if (strlen($secret) === 0) { if (strlen($secret) === 0) {
throw new FireflyException('Your two factor authentication secret is empty, which it cannot be at this point. Please check the log files.'); throw new FireflyException('Your two factor authentication secret is empty, which it cannot be at this point. Please check the log files.');
} }
Session::flash('two-factor-secret', $secret); Session::flash('two-factor-secret', $secret);
return view('auth.two-factor', compact('user')); return view('auth.two-factor', compact('user', 'title'));
} }
/** /**
@ -54,6 +55,7 @@ class TwoFactorController extends Controller
{ {
$user = Auth::user(); $user = Auth::user();
$siteOwner = env('SITE_OWNER', ''); $siteOwner = env('SITE_OWNER', '');
$title = strval(trans('firefly.two_factor_forgot_title'));
Log::info( Log::info(
'To reset the two factor authentication for user #' . $user->id . 'To reset the two factor authentication for user #' . $user->id .
@ -61,7 +63,7 @@ class TwoFactorController extends Controller
' "twoFactorAuthSecret" for user_id ' . $user->id . '. That will take care of it.' ' "twoFactorAuthSecret" for user_id ' . $user->id . '. That will take care of it.'
); );
return view('auth.lost-two-factor', compact('user', 'siteOwner')); return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
} }
/** /**

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

@ -56,7 +56,9 @@ return [
'two_factor_welcome' => 'Hello, :user!', 'two_factor_welcome' => 'Hello, :user!',
'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.', 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.',
'two_factor_code_here' => 'Enter code here', 'two_factor_code_here' => 'Enter code here',
'two_factor_title' => 'Two factor authentication',
'authenticate' => 'Authenticate', 'authenticate' => 'Authenticate',
'two_factor_forgot_title' => 'Lost two factor authentication',
'two_factor_forgot' => 'I forgot my two-factor thing.', 'two_factor_forgot' => 'I forgot my two-factor thing.',
'two_factor_lost_header' => 'Lost your two factor authentication?', 'two_factor_lost_header' => 'Lost your two factor authentication?',
'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.', 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.',