diff options
| author | antonyliu <sun_apollo@yeah.net> | 2019-05-30 11:53:05 +0800 |
|---|---|---|
| committer | antonyliu <sun_apollo@yeah.net> | 2019-05-30 13:37:25 +0800 |
| commit | c4ea3c0259b37acbf9945b357995b8a3fa42944f (patch) | |
| tree | 7be0a2d100a13d3441fde919bd6e8f9c45df2469 | |
| parent | e640093c5bef04a691500ee1cb4d2394e54e1088 (diff) | |
| download | gitlab-ce-c4ea3c0259b37acbf9945b357995b8a3fa42944f.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.
| -rw-r--r-- | app/views/profiles/two_factor_auths/show.html.haml | 6 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 9 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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9dc065d6326..1c6d1a2e496 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5273,6 +5273,9 @@ msgstr "" msgid "Install Runner on Kubernetes" msgstr "" +msgid "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}." +msgstr "" + msgid "Instance Statistics" msgstr "" @@ -8921,6 +8924,9 @@ msgstr "" msgid "Sherlock Transactions" msgstr "" +msgid "Should you ever lose your phone or access to your one time password secret, each of these recovery codes can be used one time each to regain access to your account. Please save them in a safe place, or you %{b_start}will%{b_end} lose access to your account." +msgstr "" + msgid "Show all activity" msgstr "" |