kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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.
This commit is contained in:
antonyliu 2019-05-30 11:53:05 +08:00
parent 8203f9463b
commit 5511d23039
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/profiles/two_factor_auths/show.html.haml
View File

@ -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

6
locale/gitlab.pot
View File

@ -5303,6 +5303,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 ""
@ -8981,6 +8984,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 ""