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

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

See merge request gitlab-org/gitlab-ce!23227

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

@@ -1,7 +1,6 @@
 .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,20 +2,21 @@
   .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"
-      = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
+      = f.submit _("Add to project"), class: "btn btn-success qa-add-member-button"
+      = 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

@@ -1,15 +1,15 @@
-- 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

@@ -1,39 +1,34 @@
-- page_title "Members"
+- page_title _("Members")
 
 .row.prepend-top-default
   .col-lg-12
     %h4
-      Project members
+      = _("Project members")
     - if can?(current_user, :admin_project_member, @project)
       %p
-        You can invite a new member to
-        %strong= @project.name
-        or invite another group.
+        = _("You can invite a new member to <strong>%{project_name}</strong> or invite another group.").html_safe % { project_name: sanitize_project_name(@project.name) }
     - 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?(current_user, :admin_project_member, @project)
         %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")
           - if @project.allowed_to_share_with_group?
             %li.nav-tab{ role: 'presentation' }
-              %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' }
-            = render 'projects/project_members/new_project_group', tab_title: '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

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

locale/gitlab.pot

@@ -129,6 +129,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 ""
 
@@ -399,6 +402,9 @@ msgstr ""
 msgid "Add reaction"
 msgstr ""
 
+msgid "Add to project"
+msgstr ""
+
 msgid "Add todo"
 msgstr ""
 
@@ -1305,6 +1311,9 @@ msgstr ""
 msgid "Choose a file"
 msgstr ""
 
+msgid "Choose a role permission"
+msgstr ""
+
 msgid "Choose a template..."
 msgstr ""
 
@@ -3010,6 +3019,9 @@ msgstr ""
 msgid "Existing folder"
 msgstr ""
 
+msgid "Existing members and groups"
+msgstr ""
+
 msgid "Expand"
 msgstr ""
 
@@ -3145,6 +3157,9 @@ msgstr ""
 msgid "Find by path"
 msgstr ""
 
+msgid "Find existing members by name"
+msgstr ""
+
 msgid "Find file"
 msgstr ""
 
@@ -3436,6 +3451,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 ""
 
@@ -3663,12 +3681,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 ""
 
@@ -3774,6 +3801,12 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
+msgid "Invite group"
+msgstr ""
+
+msgid "Invite member"
+msgstr ""
+
 msgid "Invoke Count"
 msgstr ""
 
@@ -4195,6 +4228,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 "Merge Request"
 msgstr ""
 
@@ -4742,6 +4781,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 ""
 
@@ -5396,6 +5438,9 @@ msgstr ""
 msgid "Project export started. A download link will be sent by email."
 msgstr ""
 
+msgid "Project members"
+msgstr ""
+
 msgid "Project name"
 msgstr ""
 
@@ -6039,6 +6084,9 @@ msgstr ""
 msgid "Select branch/tag"
 msgstr ""
 
+msgid "Select members to invite"
+msgstr ""
+
 msgid "Select project"
 msgstr ""
 
@@ -7866,6 +7914,9 @@ msgstr ""
 msgid "You can easily install a Runner on a Kubernetes cluster. %{link_to_help_page}"
 msgstr ""
 
+msgid "You can invite a new member to <strong>%{project_name}</strong> or invite another group."
+msgstr ""
+
 msgid "You can move around the graph by using the arrow keys."
 msgstr ""