Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wortschack <mwortschack@gitlab.com>2019-08-09 12:44:33 +0300
committerMartin Wortschack <mwortschack@gitlab.com>2019-08-09 12:44:33 +0300
commitf77ffdafad0a94c8a2af7070710fbfbe88994040 (patch)
tree6e62ed97508a116506b6d6dc37f6d8754f2c6fe3
parent95b0f7a8c7d021f2ba21355ed9ca217459c18a18 (diff)
Resolve more discussion
- Add placeholder for tags in translation - Update PO file
-rw-r--r--app/views/groups/group_members/index.html.haml4
-rw-r--r--locale/gitlab.pot6
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 0f2f9dd2f95..4a9e05951f9 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -35,7 +35,7 @@
.card.card-without-border
.d-flex.flex-column.flex-md-row.row-content-block.second-block
%span.flex-grow-1.align-self-md-center.col-form-label
- = _("Members with access to <strong>%{group_name}</strong>").html_safe % { group_name: @group.name }
+ = _("Members with access to %{strongStart}%{group_name}%{strongEnd}").html_safe % { group_name: @group.name, strongStart: '<strong>', strongEnd: '</strong>' }
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
.form-group.flex-grow
.position-relative.mr-md-2
@@ -55,7 +55,7 @@
.card.card-without-border
.d-flex.flex-column.flex-md-row.row-content-block.second-block
%span.flex-grow-1
- = _("Members with pending access to <strong>%{group_name}</strong>").html_safe % { group_name: @group.name }
+ = _("Members with pending access to %{strongStart}%{group_name}%{strongEnd}").html_safe % { group_name: @group.name, strongStart: '<strong>', strongEnd: '</strong>' }
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
.form-group
.position-relative.mr-md-2
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8c246414d17..7828c7a5eac 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -708,7 +708,7 @@ msgstr ""
msgid "Add new directory"
msgstr ""
-msgid "Add new member to <strong>%{group_name}</strong>"
+msgid "Add new member to %{strongStart}%{group_name}%{strongEnd}"
msgstr ""
msgid "Add or subtract spent time"
@@ -6586,10 +6586,10 @@ msgstr ""
msgid "Members of <strong>%{project_name}</strong>"
msgstr ""
-msgid "Members with access to <strong>%{group_name}</strong>"
+msgid "Members with access to %{strongStart}%{group_name}%{strongEnd}"
msgstr ""
-msgid "Members with pending access to <strong>%{group_name}</strong>"
+msgid "Members with pending access to %{strongStart}%{group_name}%{strongEnd}"
msgstr ""
msgid "Merge"