Commit 97475f12 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch 'fix-externalization-in-haml' into 'master'

Fix wrong externalization in HAML

See merge request gitlab-org/gitlab!58843
parents 4f4a6225 1484700d
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.col-lg-8 .col-lg-8
-# TODO: might need an entry in user/profile.md to describe some of these settings -# TODO: might need an entry in user/profile.md to describe some of these settings
-# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070 -# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070
%h5= ("Time zone") %h5= _("Time zone")
= dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } ) = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
%input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone } %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone }
.col-lg-12 .col-lg-12
......
...@@ -32068,6 +32068,9 @@ msgstr "" ...@@ -32068,6 +32068,9 @@ msgstr ""
msgid "Time until first merge request" msgid "Time until first merge request"
msgstr "" msgstr ""
msgid "Time zone"
msgstr ""
msgid "TimeTrackingEstimated|Est" msgid "TimeTrackingEstimated|Est"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment