diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 3 | ||||
-rw-r--r-- | app/views/shared/members/_filter_2fa_dropdown.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/members/_group.html.haml | 10 | ||||
-rw-r--r-- | app/views/shared/members/_member.html.haml | 27 | ||||
-rw-r--r-- | app/views/shared/members/_requests.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/members/_sort_dropdown.html.haml | 2 |
7 files changed, 24 insertions, 26 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 3cd5168c1f7..477030a20c1 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -108,7 +108,7 @@ = link_to group_group_members_path(@group) do .nav-icon-container = sprite_icon('users') - %span.nav-item-name + %span.nav-item-name.qa-group-members-item = _('Members') %ul.sidebar-sub-level-items.is-fly-out-only = nav_link(path: 'group_members#index', html_options: { class: "fly-out-top-item" } ) do diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 824bbe3524b..6939aba6896 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -7,8 +7,7 @@ .issues-filters .issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal } - if type == :boards - #js-multiple-boards-switcher.inline.boards-switcher{ "v-cloak" => true } - = render_if_exists "shared/boards/switcher", board: board + = render_if_exists "shared/boards/switcher", board: board = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form' do - if params[:search].present? = hidden_field_tag :search, params[:search] diff --git a/app/views/shared/members/_filter_2fa_dropdown.html.haml b/app/views/shared/members/_filter_2fa_dropdown.html.haml index 95c35c56b3c..3e98587aeaa 100644 --- a/app/views/shared/members/_filter_2fa_dropdown.html.haml +++ b/app/views/shared/members/_filter_2fa_dropdown.html.haml @@ -1,10 +1,10 @@ - filter = params[:two_factor] || 'everyone' -- filter_options = { 'everyone' => 'Everyone', 'enabled' => 'Enabled', 'disabled' => 'Disabled' } +- filter_options = { 'everyone' => _('Everyone'), 'enabled' => _('Enabled'), 'disabled' => _('Disabled') } .dropdown.inline.member-filter-2fa-dropdown = dropdown_toggle('2FA: ' + filter_options[filter], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable %li.dropdown-header - Filter by two-factor authentication + = _("Filter by two-factor authentication") - filter_options.each do |value, title| %li = link_to filter_group_project_member_path(two_factor: value), class: ("is-active" if filter == value) do diff --git a/app/views/shared/members/_group.html.haml b/app/views/shared/members/_group.html.haml index d0b492b43f3..9ec76d82d18 100644 --- a/app/views/shared/members/_group.html.haml +++ b/app/views/shared/members/_group.html.haml @@ -12,7 +12,7 @@ - if group_link.expires? · %span{ class: ('text-warning' if group_link.expires_soon?) } - Expires in #{distance_of_time_in_words_to_now(group_link.expires_at)} + = _("Expires in %{expires_at}").html_safe % { expires_at: distance_of_time_in_words_to_now(group_link.expires_at) } .controls.member-controls = form_tag project_group_link_path(@project, group_link), method: :put, remote: true, class: 'js-edit-member-form form-group row append-right-5' do = hidden_field_tag "group_link[group_access]", group_link.group_access @@ -24,7 +24,7 @@ = group_link.human_access = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-right.dropdown-menu-selectable - = dropdown_title("Change permissions") + = dropdown_title(_("Change permissions")) .dropdown-content %ul - Gitlab::Access.options.each do |role, role_id| @@ -33,13 +33,13 @@ class: ("is-active" if group_link.group_access == role_id), data: { id: role_id, el_id: dom_id } .prepend-left-5.clearable-input.member-form-control - = text_field_tag 'group_link[expires_at]', group_link.expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: 'Expiration date', id: "member_expires_at_#{group.id}", disabled: !can_admin_member + = text_field_tag 'group_link[expires_at]', group_link.expires_at, class: 'form-control js-access-expiration-date js-member-update-control', placeholder: _('Expiration date'), id: "member_expires_at_#{group.id}", disabled: !can_admin_member %i.clear-icon.js-clear-input - if can_admin_member = link_to project_group_link_path(@project, group_link), method: :delete, - data: { confirm: "Are you sure you want to remove #{group.name}?" }, + data: { confirm: _("Are you sure you want to remove %{group_name}?") % { group_name: group.name } }, class: 'btn btn-remove prepend-left-10' do %span.d-block.d-sm-none - Delete + = _("Delete") = icon('trash', class: 'd-none d-sm-block') diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index b4b3f4a6b7e..a7fd75d85d7 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -17,15 +17,15 @@ = render_if_exists 'shared/members/ee/sso_badge', member: member - if user == current_user - %span.badge.badge-success.prepend-left-5 It's you + %span.badge.badge-success.prepend-left-5= _("It's you") - if user.blocked? %label.badge.badge-danger - %strong Blocked + %strong= _("Blocked") - if user.two_factor_enabled? %label.badge.badge-info - 2FA + = _("2FA") - if source.instance_of?(Group) && source != @group · @@ -33,14 +33,13 @@ .cgray - if member.request? - Requested - = time_ago_with_tooltip(member.requested_at) + = _("Requested %{time_ago}").html_safe % { time_ago: time_ago_with_tooltip(member.requested_at) } - else - Given access #{time_ago_with_tooltip(member.created_at)} + = _("Given access %{time_ago}").html_safe % { time_ago: time_ago_with_tooltip(member.created_at) } - if member.expires? · %span{ class: "#{"text-warning" if member.expires_soon?} has-tooltip", title: member.expires_at.to_time.in_time_zone.to_s(:medium) } - Expires in #{distance_of_time_in_words_to_now(member.expires_at)} + = _("Expires in %{expires_at}").html_safe % { expires_at: distance_of_time_in_words_to_now(member.expires_at) } - else = image_tag avatar_icon_for_email(member.invite_email, 40), class: "avatar s40", alt: '' @@ -61,7 +60,7 @@ = link_to icon('paper-plane'), polymorphic_path([:resend_invite, member]), method: :post, class: 'btn btn-default prepend-left-10 d-none d-sm-block', - title: 'Resend invite' + title: _('Resend invite') - if user != current_user && member.can_update? = form_for member, remote: true, html: { class: 'js-edit-member-form form-group row append-right-5' } do |f| @@ -73,7 +72,7 @@ = member.human_access = icon("chevron-down") .dropdown-menu.dropdown-select.dropdown-menu-right.dropdown-menu-selectable - = dropdown_title("Change permissions") + = dropdown_title(_("Change permissions")) .dropdown-content %ul - member.access_level_roles.each do |role, role_id| @@ -84,7 +83,7 @@ .prepend-left-5.clearable-input.member-form-control = f.text_field :expires_at, class: 'form-control js-access-expiration-date js-member-update-control', - placeholder: 'Expiration date', + placeholder: _('Expiration date'), id: "member_expires_at_#{member.id}", data: { el_id: dom_id(member) } %i.clear-icon.js-clear-input @@ -95,15 +94,15 @@ = link_to polymorphic_path([:approve_access_request, member]), method: :post, class: 'btn btn-success prepend-left-10', - title: 'Grant access' do + title: _('Grant access') do %span{ class: ('d-block d-sm-none' unless force_mobile_view) } - Grant access + = _('Grant access') - unless force_mobile_view = icon('check inverse', class: 'd-none d-sm-block') - if member.can_remove? - if current_user == user - = link_to icon('sign-out', text: 'Leave'), polymorphic_path([:leave, member.source, :members]), + = link_to icon('sign-out', text: _('Leave')), polymorphic_path([:leave, member.source, :members]), method: :delete, data: { confirm: leave_confirmation_message(member.source) }, class: 'btn btn-remove prepend-left-10' @@ -114,7 +113,7 @@ class: 'btn btn-remove prepend-left-10', title: remove_member_title(member) do %span{ class: ('d-block d-sm-none' unless force_mobile_view) } - Delete + = _("Delete") - unless force_mobile_view = icon('trash', class: 'd-none d-sm-block') - else diff --git a/app/views/shared/members/_requests.html.haml b/app/views/shared/members/_requests.html.haml index 54679ab86cc..1f62c3cbcf4 100644 --- a/app/views/shared/members/_requests.html.haml +++ b/app/views/shared/members/_requests.html.haml @@ -6,7 +6,7 @@ .card.prepend-top-default{ class: ('card-mobile' if force_mobile_view ) } .card-header - Users requesting access to + = _("Users requesting access to") %strong= membership_source.name %span.badge.badge-pill= requesters.size %ul.content-list.members-list diff --git a/app/views/shared/members/_sort_dropdown.html.haml b/app/views/shared/members/_sort_dropdown.html.haml index 56b8c8f033e..59bdfb73e6e 100644 --- a/app/views/shared/members/_sort_dropdown.html.haml +++ b/app/views/shared/members/_sort_dropdown.html.haml @@ -2,7 +2,7 @@ = dropdown_toggle(member_sort_options_hash[@sort], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable %li.dropdown-header - Sort by + = _("Sort by") - member_sort_options_hash.each do |value, title| %li = link_to filter_group_project_member_path(sort: value), class: ("is-active" if @sort == value) do |