Automatic merge of gitlab-org/gitlab-ce master

02c63702 · GitLab Bot · 24aa2ab0 · 4518806c · 02c63702
Commit 02c63702 authored Apr 24, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/shared/_sidebar_toggle_button.html.haml app/views/shared/_sidebar_toggle_button.html.haml +2 -2

No files found.
--- a/app/views/shared/_sidebar_toggle_button.html.haml
+++ b/app/views/shared/_sidebar_toggle_button.html.haml
 %a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" }
  = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left')
  = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right')
-  %span.collapse-text Collapse sidebar
+  %span.collapse-text _("Collapse sidebar")

 = button_tag class: 'close-nav-button', type: 'button' do
  = sprite_icon('close', size: 16)
-  %span.collapse-text Close sidebar
+  %span.collapse-text _("Close sidebar")