Commit 4f4a6225 authored by Vitaly Slobodin's avatar Vitaly Slobodin

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

Fix wrong externalization in HAML (EE)

See merge request gitlab-org/gitlab!58844
parents ace8bf48 14f6d92d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- elsif @group.ldap_sync_pending? - elsif @group.ldap_sync_pending?
%span.btn.gl-button.disabled %span.btn.gl-button.disabled
= sprite_icon("retry", css_class: 'spin gl-mr-2') = sprite_icon("retry", css_class: 'spin gl-mr-2')
= ('Pending sync…') = _('Pending sync…')
- else - else
= link_to sync_group_ldap_path(@group), method: :put, class: 'btn btn-default gl-button qa-sync-now-button' do = link_to sync_group_ldap_path(@group), method: :put, class: 'btn btn-default gl-button qa-sync-now-button' do
= sprite_icon("retry", css_class: "gl-mr-2") = sprite_icon("retry", css_class: "gl-mr-2")
......
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
- if @project.import_state.mirror_update_due? - if @project.import_state.mirror_update_due?
%span.btn.gl-button.btn-default.disabled %span.btn.gl-button.btn-default.disabled
= sprite_icon('retry', css_class: 'spin gl-mr-3') = sprite_icon('retry', css_class: 'spin gl-mr-3')
= ('Update Scheduled…') = _('Update Scheduled…')
- elsif @project.import_state.updating_mirror? - elsif @project.import_state.updating_mirror?
%span.btn.gl-button.btn-default.disabled %span.btn.gl-button.btn-default.disabled
= sprite_icon('retry', css_class: 'spin gl-mr-3') = sprite_icon('retry', css_class: 'spin gl-mr-3')
= ('Updating…') = _('Updating…')
- elsif can?(current_user, :admin_project, @project) - elsif can?(current_user, :admin_project, @project)
= link_to update_now_project_mirror_path(@project), method: :post, class: 'gl-button btn btn-default' do = link_to update_now_project_mirror_path(@project), method: :post, class: 'gl-button btn btn-default' do
= sprite_icon('retry', css_class: 'gl-mr-3') = sprite_icon('retry', css_class: 'gl-mr-3')
= ('Update Now') = _('Update Now')
- else - else
%span.btn.gl-button.btn-default.disabled %span.btn.gl-button.btn-default.disabled
= sprite_icon('retry', css_class: 'gl-mr-3') = sprite_icon('retry', css_class: 'gl-mr-3')
= ('Update Now') = _('Update Now')
- if @project.mirror_last_update_succeeded? - if @project.mirror_last_update_succeeded?
%p.inline.gl-ml-3 %p.inline.gl-ml-3
= ('Successfully updated %{last_updated_timeago}.').html_safe % { last_updated_timeago: time_ago_with_tooltip(@project.import_state.last_successful_update_at) } = _('Successfully updated %{last_updated_timeago}.').html_safe % { last_updated_timeago: time_ago_with_tooltip(@project.import_state.last_successful_update_at) }
...@@ -22653,6 +22653,9 @@ msgstr "" ...@@ -22653,6 +22653,9 @@ msgstr ""
msgid "Pending comments" msgid "Pending comments"
msgstr "" msgstr ""
msgid "Pending sync…"
msgstr ""
msgid "People without permission will never get a notification and won't be able to comment." msgid "People without permission will never get a notification and won't be able to comment."
msgstr "" msgstr ""
...@@ -29848,6 +29851,9 @@ msgstr "" ...@@ -29848,6 +29851,9 @@ msgstr ""
msgid "Successfully unlocked" msgid "Successfully unlocked"
msgstr "" msgstr ""
msgid "Successfully updated %{last_updated_timeago}."
msgstr ""
msgid "Successfully verified domain ownership" msgid "Successfully verified domain ownership"
msgstr "" msgstr ""
...@@ -33163,6 +33169,12 @@ msgstr "" ...@@ -33163,6 +33169,12 @@ msgstr ""
msgid "Update %{sourcePath} file" msgid "Update %{sourcePath} file"
msgstr "" msgstr ""
msgid "Update Now"
msgstr ""
msgid "Update Scheduled…"
msgstr ""
msgid "Update all" msgid "Update all"
msgstr "" msgstr ""
...@@ -33235,6 +33247,9 @@ msgstr "" ...@@ -33235,6 +33247,9 @@ msgstr ""
msgid "Updating" msgid "Updating"
msgstr "" msgstr ""
msgid "Updating…"
msgstr ""
msgid "Upgrade offers available!" msgid "Upgrade offers available!"
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