From 4c24a9d4e72f0e4ddd47290764149af24bb3e473 Mon Sep 17 00:00:00 2001 From: Tao Wang Date: Thu, 14 Jun 2018 19:01:30 +1000 Subject: [PATCH] i18n: externalize strings from 'app/views/projects/project_members' Signed-off-by: Tao Wang --- .../project_members/_groups.html.haml | 3 +- .../_new_project_member.html.haml | 16 ++--- .../_new_shared_group.html.haml | 14 ++--- .../projects/project_members/_team.html.haml | 7 +-- .../projects/project_members/import.html.haml | 12 ++-- .../projects/project_members/index.html.haml | 23 +++---- locale/gitlab.pot | 63 +++++++++++++++++++ 7 files changed, 98 insertions(+), 40 deletions(-) diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml index 3f05e06b0c63e4..bb40a6151faf0a 100644 --- a/app/views/projects/project_members/_groups.html.haml +++ b/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 %{project_name}").html_safe % { 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 diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml index 488c61a747e557..025ed9d66f6b0b 100644 --- a/app/views/projects/project_members/_new_project_member.html.haml +++ b/app/views/projects/project_members/_new_project_member.html.haml @@ -2,21 +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" - = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true, placeholder: "Search for members to update or invite") + = label_tag :user_ids, _("Select members to invite"), class: "label-bold" + = users_select_tag(:user_ids, multiple: true, class: "input-clamp", 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"), class: "vlink" - about role permissions + - link_to_read_more = link_to(_("Read more"), help_page_path("user/permissions"), class: "vlink") + = _("%{link_to_read_more} about role permissions").html_safe % { link_to_read_more: link_to_read_more } .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-create" + = f.submit _("Add to project"), class: "btn btn-create" - 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") diff --git a/app/views/projects/project_members/_new_shared_group.html.haml b/app/views/projects/project_members/_new_shared_group.html.haml index d7227c32833906..27d85262cacaef 100644 --- a/app/views/projects/project_members/_new_shared_group.html.haml +++ b/app/views/projects/project_members/_new_shared_group.html.haml @@ -2,19 +2,19 @@ .col-sm-12 = form_tag project_group_links_path(@project), class: 'js-requires-input', method: :post do .form-group - = label_tag :link_group_id, "Select a group to share with", class: "label-bold" + = label_tag :link_group_id, _("Select a group to share with"), class: "label-bold" = groups_select_tag(:link_group_id, data: { skip_groups: @skip_groups }, class: "input-clamp", required: true) .form-group - = label_tag :link_group_access, "Max access level", class: "label-bold" + = label_tag :link_group_access, _("Max access level"), class: "label-bold" .select-wrapper = 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"), class: "vlink" - about role permissions + - link_to_read_more = link_to(_("Read more"), help_page_path("user/permissions"), class: "vlink") + = _("%{link_to_read_more} about role permissions").html_safe % { link_to_read_more: link_to_read_more } .form-group - = label_tag :expires_at, 'Access expiration date', class: 'label-bold' + = label_tag :expires_at, _('Access expiration date'), class: 'label-bold' .clearable-input - = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: 'Expiration date', id: 'expires_at_groups' + = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date-groups', placeholder: _('Expiration date'), id: 'expires_at_groups' %i.clear-icon.js-clear-input - = submit_tag "Share", class: "btn btn-create" + = submit_tag _("Share"), class: "btn btn-create" diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index 0c5a187f208316..33de78392896ae 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/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 %{project_name}").html_safe % { 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 diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml index 6a52e72bfd8569..2ecca345fcf013 100644 --- a/app/views/projects/project_members/import.html.haml +++ b/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-create" - = link_to "Cancel", project_project_members_path(@project), class: "btn btn-cancel" + = button_tag _('Import project members'), class: "btn btn-create" + = link_to _("Cancel"), project_project_members_path(@project), class: "btn btn-cancel" diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 4d3b971a2fd05c..2cd135fc12da16 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -1,43 +1,40 @@ -- 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 Maintainers or Owners').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: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' } Add member + %a.nav-link.active{ href: '#add-member-pane', id: 'add-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _('Add member') %li.nav-tab{ role: 'presentation', class: ('active' if membership_locked?) } - %a.nav-link{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' } Share with group + %a.nav-link{ href: '#share-with-group-pane', id: 'share-with-group-tab', data: { toggle: 'tab' }, role: 'tab' }= _('Share with group') .tab-content.gitlab-tab-content .tab-pane.active{ id: 'add-member-pane', role: 'tabpanel' } - = render 'projects/project_members/new_project_member', tab_title: 'Add member' + = render 'projects/project_members/new_project_member', tab_title: _('Add member') .tab-pane{ id: 'share-with-group-pane', role: 'tabpanel', class: ('active' if membership_locked?) } - = render 'projects/project_members/new_shared_group', tab_title: 'Share with group' + = render 'projects/project_members/new_shared_group', tab_title: _('Share with group') - elsif !membership_locked? - .add-member= render 'projects/project_members/new_project_member', tab_title: 'Add member' + .add-member= render 'projects/project_members/new_project_member', tab_title: _('Add member') - elsif @project.allowed_to_share_with_group? - .share-with-group= render 'projects/project_members/new_shared_group', tab_title: 'Share with group' + .share-with-group= render 'projects/project_members/new_shared_group', tab_title: _('Share with 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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5..d2c53414452441 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -122,6 +122,9 @@ msgstr "" msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgstr "" +msgid "%{link_to_read_more} about role permissions" +msgstr "" + msgid "%{loadingIcon} Started" msgstr "" @@ -354,6 +357,9 @@ msgstr "" msgid "Access denied! Please verify you can add deploy keys to this repository." msgstr "" +msgid "Access expiration date" +msgstr "" + msgid "Access to '%{classification_label}' not allowed" msgstr "" @@ -402,6 +408,9 @@ msgstr "" msgid "Add additional text to appear in all email communications. %{character_limit} character limit" msgstr "" +msgid "Add member" +msgstr "" + msgid "Add new application" msgstr "" @@ -411,6 +420,9 @@ msgstr "" msgid "Add reaction" msgstr "" +msgid "Add to project" +msgstr "" + msgid "Add todo" msgstr "" @@ -1373,6 +1385,9 @@ msgstr "" msgid "Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request." msgstr "" +msgid "Choose a role permission" +msgstr "" + msgid "Choose any color." msgstr "" @@ -2966,6 +2981,9 @@ msgstr "" msgid "Everyone can contribute" msgstr "" +msgid "Existing members and groups" +msgstr "" + msgid "Expand" msgstr "" @@ -2975,6 +2993,9 @@ msgstr "" msgid "Expand sidebar" msgstr "" +msgid "Expiration date" +msgstr "" + msgid "Explore" msgstr "" @@ -3074,6 +3095,9 @@ msgstr "" msgid "Find by path" msgstr "" +msgid "Find existing members by name" +msgstr "" + msgid "Find file" msgstr "" @@ -3649,6 +3673,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 %{project_name}" +msgstr "" + msgid "GroupsDropdown|Frequently visited" msgstr "" @@ -3867,12 +3894,21 @@ msgstr "" msgid "Import in progress" 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 "" @@ -4344,6 +4380,9 @@ msgstr "" msgid "Markdown enabled" msgstr "" +msgid "Max access level" +msgstr "" + msgid "Maximum git storage failures" msgstr "" @@ -4356,6 +4395,12 @@ msgstr "" msgid "Members" msgstr "" +msgid "Members can be added by project Maintainers or Owners" +msgstr "" + +msgid "Members of %{project_name}" +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 "" @@ -4969,6 +5014,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 "" @@ -5467,6 +5515,9 @@ msgstr "" msgid "Project export started. A download link will be sent by email." msgstr "" +msgid "Project members" +msgstr "" + msgid "Project name" msgstr "" @@ -6050,6 +6101,9 @@ msgstr "" msgid "Search files" msgstr "" +msgid "Search for members to update or invite" +msgstr "" + msgid "Search for projects, issues, etc." msgstr "" @@ -6130,6 +6184,9 @@ msgstr "" msgid "Select Archive Format" msgstr "" +msgid "Select a group to share with" +msgstr "" + msgid "Select a namespace to fork the project" msgstr "" @@ -6145,6 +6202,9 @@ msgstr "" msgid "Select branch/tag" msgstr "" +msgid "Select members to invite" +msgstr "" + msgid "Select project" msgstr "" @@ -6238,6 +6298,9 @@ msgstr "" msgid "Share the %{sso_label} with members so they can sign in to your group through your identity provider" msgstr "" +msgid "Share with group" +msgstr "" + msgid "Shared Runners" msgstr "" -- GitLab