Merge branch 'ee-gt-externalize-app-views-projects-project_members' into 'master'

Externalize strings from `/app/views/projects/project_members`

See merge request gitlab-org/gitlab-ee!8727

app/views/projects/project_members/_groups.html.haml

 .card.project-members-groups
   .card-header
-    Groups with access to
-    %strong= @project.name
+    = _("Groups with access to <strong>%{project_name}</strong>").html_safe % { project_name: sanitize_project_name(@project.name) }
     %span.badge.badge-pill= group_links.size
   %ul.content-list.members-list
     = render partial: 'shared/members/group', collection: group_links, as: :group_link

app/views/projects/project_members/_new_project_group.html.haml

@@ -10,8 +10,9 @@
           = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control select-control"
           = icon('chevron-down')
         .form-text.text-muted.append-bottom-10
-          = link_to _("Read more"), help_page_path("user/permissions")
-          about role permissions
+          - permissions_docs_path = help_page_path('user/permissions')
+          - link_start = %q{<a href="%{url}">}.html_safe % { url: permissions_docs_path }
+          = _("%{link_start}Read more%{link_end} about role permissions").html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       .form-group
         = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
         .clearable-input

app/views/projects/project_members/_new_project_member.html.haml

@@ -2,21 +2,22 @@
   .col-sm-12
     = form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f|
       .form-group
-        = label_tag :user_ids, "Select members to invite", class: "label-bold"
+        = label_tag :user_ids, _("Select members to invite"), class: "label-bold"
         = users_select_tag(:user_ids, multiple: true, class: "input-clamp qa-member-select-input", scope: :all, email_user: true, placeholder: "Search for members to update or invite")
       .form-group
-        = label_tag :access_level, "Choose a role permission", class: "label-bold"
+        = label_tag :access_level, _("Choose a role permission"), class: "label-bold"
         .select-wrapper
           = select_tag :access_level, options_for_select(ProjectMember.access_level_roles, @project_member.access_level), class: "form-control project-access-select select-control"
           = icon('chevron-down')
         .form-text.text-muted.append-bottom-10
-          = link_to "Read more", help_page_path("user/permissions")
-          about role permissions
+          - permissions_docs_path = help_page_path('user/permissions')
+          - link_start = %q{<a href="%{url}">}.html_safe % { url: permissions_docs_path }
+          = _("%{link_start}Read more%{link_end} about role permissions").html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       .form-group
         .clearable-input
-          = label_tag :expires_at, 'Access expiration date', class: 'label-bold'
+          = label_tag :expires_at, _('Access expiration date'), class: 'label-bold'
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           %i.clear-icon.js-clear-input
-      = f.submit "Add to project", class: "btn btn-success qa-add-member-button"
+      = f.submit _("Add to project"), class: "btn btn-success qa-add-member-button"
       - if can?(current_user, :admin_project_member, @project) && !membership_locked?
-        = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
+        = link_to _("Import"), import_project_project_members_path(@project), class: "btn btn-default", title: _("Import members from another project")

app/views/projects/project_members/_team.html.haml

@@ -4,14 +4,13 @@
 .card
   .card-header.flex-project-members-panel
     %span.flex-project-title
-      Members of
-      %strong= project.name
+      = _("Members of <strong>%{project_name}</strong>").html_safe % { project_name: sanitize_project_name(project.name) }
     %span.badge.badge-pill= members.total_count
     = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form'  do
       .form-group
         .position-relative
-          = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
-          %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+          = search_field_tag :search, params[:search], { placeholder: _('Find existing members by name'), class: 'form-control', spellcheck: false }
+          %button.member-search-btn{ type: "submit", "aria-label" => _("Submit search") }
             = icon("search")
         = render 'shared/members/sort_dropdown'
   %ul.content-list.members-list.qa-members-list

app/views/projects/project_members/import.html.haml

-- page_title "Import members"
+- page_title _("Import members")
 
 %h3.page-title
-  Import members from another project
+  = _("Import members from another project")
 %p.light
-  Only project members will be imported. Group members will be skipped.
+  = _("Only project members will be imported. Group members will be skipped.")
 %hr
 = form_tag apply_import_project_project_members_path(@project), method: 'post' do
   .form-group.row
-    = label_tag :source_project_id, "Project", class: 'col-form-label col-sm-2'
+    = label_tag :source_project_id, _("Project"), class: 'col-form-label col-sm-2'
     .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
 
   .form-actions
-    = button_tag 'Import project members', class: "btn btn-success"
-    = link_to "Cancel", project_project_members_path(@project), class: "btn btn-cancel"
+    = button_tag _('Import project members'), class: "btn btn-success"
+    = link_to _("Cancel"), project_project_members_path(@project), class: "btn btn-cancel"

app/views/projects/project_members/index.html.haml

-- page_title "Members"
+- page_title _("Members")
 - can_admin_project_members = can?(current_user, :admin_project_member, @project)
 
 .row.prepend-top-default
   .col-lg-12
     - if project_can_be_shared?
       %h4
-        Project members
+        = _("Project members")
       - if can_admin_project_members
         %p= share_project_description
       - else
         %p
-          Members can be added by project
-          %i Maintainers
-          or
-          %i Owners
+          = _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe
 
     .light
       - if can_admin_project_members && project_can_be_shared?
         - if !membership_locked? && @project.allowed_to_share_with_group?
           %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
             %li.nav-tab{ role: 'presentation' }
-              %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' } Invite member
+              %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member")
             %li.nav-tab{ role: 'presentation', class: ('active' if membership_locked?) }
-              %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab' }, role: 'tab' } Invite group
+              %a.nav-link{ href: '#invite-group-pane', id: 'invite-group-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite group")
 
           .tab-content.gitlab-tab-content
             .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
-              = render 'projects/project_members/new_project_member', tab_title: 'Invite member'
+              = render 'projects/project_members/new_project_member', tab_title: _('Invite member')
             .tab-pane{ id: 'invite-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) }
-              = render 'projects/project_members/new_project_group', tab_title: 'Invite group'
+              = render 'projects/project_members/new_project_group', tab_title: _('Invite group')
         - elsif !membership_locked?
-          .invite-member= render 'projects/project_members/new_project_member', tab_title: 'Invite member'
+          .invite-member= render 'projects/project_members/new_project_member', tab_title: _('Invite member')
         - elsif @project.allowed_to_share_with_group?
-          .invite-group= render 'projects/project_members/new_project_group', tab_title: 'Invite group'
+          .invite-group= render 'projects/project_members/new_project_group', tab_title: _('Invite group')
 
         = render 'shared/members/requests', membership_source: @project, requesters: @requesters
         .clearfix
           %h5.member.existing-title
-            Existing members and groups
+            = _("Existing members and groups")
         - if @group_links.any?
           = render 'projects/project_members/groups', group_links: @group_links
 

changelogs/unreleased/gt-externalize-app-views-projects-project_members.yml

+---
+title: Externalize strings from `/app/views/projects/project_members`
+merge_request: 23227
+author: Tao Wang
+type: other

locale/gitlab.pot

@@ -170,6 +170,9 @@ msgstr ""
 msgid "%{issuableType} will be removed! Are you sure?"
 msgstr ""
 
+msgid "%{link_start}Read more%{link_end} about role permissions"
+msgstr ""
+
 msgid "%{loadingIcon} Started"
 msgstr ""
 
@@ -497,6 +500,9 @@ msgstr ""
 msgid "Add reaction"
 msgstr ""
 
+msgid "Add to project"
+msgstr ""
+
 msgid "Add to review"
 msgstr ""
 
@@ -1648,6 +1654,9 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
+msgid "Choose a role permission"
+msgstr ""
+
 msgid "Choose a template..."
 msgstr ""
 
@@ -3575,6 +3584,9 @@ msgstr ""
 msgid "Existing folder"
 msgstr ""
 
+msgid "Existing members and groups"
+msgstr ""
+
 msgid "Expand"
 msgstr ""
 
@@ -3842,6 +3854,9 @@ msgstr ""
 msgid "Find by path"
 msgstr ""
 
+msgid "Find existing members by name"
+msgstr ""
+
 msgid "Find file"
 msgstr ""
 
@@ -4562,6 +4577,9 @@ msgstr ""
 msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}."
 msgstr ""
 
+msgid "Groups with access to <strong>%{project_name}</strong>"
+msgstr ""
+
 msgid "GroupsDropdown|Frequently visited"
 msgstr ""
 
@@ -4807,12 +4825,21 @@ msgstr ""
 msgid "Import issues"
 msgstr ""
 
+msgid "Import members"
+msgstr ""
+
+msgid "Import members from another project"
+msgstr ""
+
 msgid "Import multiple repositories by uploading a manifest file."
 msgstr ""
 
 msgid "Import project"
 msgstr ""
 
+msgid "Import project members"
+msgstr ""
+
 msgid "Import projects from Bitbucket"
 msgstr ""
 
@@ -4935,6 +4962,12 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
+msgid "Invite group"
+msgstr ""
+
+msgid "Invite member"
+msgstr ""
+
 msgid "Invoke Count"
 msgstr ""
 
@@ -5527,6 +5560,12 @@ msgstr ""
 msgid "Members"
 msgstr ""
 
+msgid "Members can be added by project <i>Maintainers</i> or <i>Owners</i>"
+msgstr ""
+
+msgid "Members of <strong>%{project_name}</strong>"
+msgstr ""
+
 msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
 msgstr ""
 
@@ -6251,6 +6290,9 @@ msgstr ""
 msgid "Only project members can comment."
 msgstr ""
 
+msgid "Only project members will be imported. Group members will be skipped."
+msgstr ""
+
 msgid "Oops, are you sure?"
 msgstr ""
 
@@ -6968,6 +7010,9 @@ msgstr ""
 msgid "Project export started. A download link will be sent by email."
 msgstr ""
 
+msgid "Project members"
+msgstr ""
+
 msgid "Project name"
 msgstr ""
 
@@ -7935,6 +7980,9 @@ msgstr ""
 msgid "Select branch/tag"
 msgstr ""
 
+msgid "Select members to invite"
+msgstr ""
+
 msgid "Select project"
 msgstr ""