diff --git a/app/Helpers/Csv/Importer.php b/app/Helpers/Csv/Importer.php index ac1bcdffb4..77553dab89 100644 --- a/app/Helpers/Csv/Importer.php +++ b/app/Helpers/Csv/Importer.php @@ -120,6 +120,8 @@ class Importer Log::error('Caught error at row #' . $index . ': ' . $result); $this->errors[$index] = $result; } else { + + $this->imported++; $this->journals->push($result); } diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 7fba607d2d..eb063155bf 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -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 $secret = Preferences::get('twoFactorAuthSecret', '')->data; + $title = strval(trans('firefly.two_factor_title')); 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.'); } 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(); $siteOwner = env('SITE_OWNER', ''); + $title = strval(trans('firefly.two_factor_forgot_title')); Log::info( '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.' ); - return view('auth.lost-two-factor', compact('user', 'siteOwner')); + return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title')); } /** diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 3787d705e4..95c33a467d 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -56,7 +56,9 @@ return [ '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_code_here' => 'Enter code here', + 'two_factor_title' => 'Two factor authentication', 'authenticate' => 'Authenticate', + 'two_factor_forgot_title' => 'Lost two factor authentication', 'two_factor_forgot' => 'I forgot my two-factor thing.', '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.',