Merge branch 'develop' into adminlte

This commit is contained in:
James Cole
2026-05-30 04:23:06 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -1418,6 +1418,7 @@ return [
'pref_two_factor_auth_code_help' => 'Scan the QR code with an application on your phone such as Authy or Google Authenticator and enter the generated code. The QR code changes every time you visit this page. Make sure you use the most recent one.',
'pref_two_factor_auth_reset_code' => 'Reset verification code',
'pref_two_factor_auth_disable_2fa' => 'Disable MFA',
'pref_two_factor_qr_code' => 'QR code',
'2fa_use_secret_instead' => 'If you cannot scan the QR code, feel free to use the secret instead: <code>:secret</code>.',
'2fa_backup_codes' => 'Store these backup codes for access in case you lose your device.',
'2fa_already_enabled' => 'Multi-factor authentication verification is already enabled.',

View File

@@ -19,7 +19,7 @@
</p>
<div class="form group">
<div class="col-sm-8 col-md-offset-4 hidden-print">
{{ image|raw }}
<img src="{{ image }}" alt="{{ 'pref_two_factor_qr_code'|_ }}">
</div>
<p class="hidden-print">
{{ trans('firefly.2fa_use_secret_instead', {secret: secret|escape})|raw }}