diff options
| author | antonyliu <sun_apollo@yeah.net> | 2019-05-30 11:53:05 +0800 |
|---|---|---|
| committer | antonyliu <sun_apollo@yeah.net> | 2019-05-31 12:32:11 +0800 |
| commit | 5511d23039ac092e797aa75bcb32f1c4bc02837b (patch) | |
| tree | 39ed22059ea1076e2b14bf75b333b9b1aded80cc /app | |
| parent | 8203f9463ba5d717bbd8a1edddc6f2a4231c6274 (diff) | |
| download | gitlab-ce-5511d23039ac092e797aa75bcb32f1c4bc02837b.tar.gz | |
Fix bug for picking up string that end with html_safe
Move .html_safe outside of the _() so the parser picks up on the translation.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml index 7a998bc3a1a..5501e63e027 100644 --- a/app/views/profiles/two_factor_auths/show.html.haml +++ b/app/views/profiles/two_factor_auths/show.html.haml @@ -25,9 +25,9 @@ - else %p - - document_url = help_page_path('user/profile/account/two_factor_authentication') - - help_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: document_url } - = _('Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}.'.html_safe) % { free_otp_link:'<a href="https://freeotp.github.io/">FreeOTP</a>'.html_safe, help_link_start:help_link_start, help_link_end:'</a>'.html_safe } + - help_link_start = '<a href="%{url}" target="_blank">' % { url: help_page_path('user/profile/account/two_factor_authentication') } + - register_2fa_token = _('Install a soft token authenticator like %{free_otp_link} or Google Authenticator from your application repository and scan this QR code. More information is available in the %{help_link_start}documentation%{help_link_end}.') % { free_otp_link:'<a href="https://freeotp.github.io/">FreeOTP</a>', help_link_start:help_link_start, help_link_end:'</a>' } + = register_2fa_token.html_safe .row.append-bottom-10 .col-md-4 = raw @qr_code |