Commit de558678 authored by Lee Tickett's avatar Lee Tickett Committed by Kushal Pandya

Updated i18n strings

This should make Danger bot happier
parent 599681ca
<script> <script>
import { GlLink } from '@gitlab/ui'; import { GlLink, GlSprintf } from '@gitlab/ui';
import { __, sprintf } from '../../locale'; import { __ } from '../../locale';
import createFlash from '../../flash'; import createFlash from '../../flash';
import Api from '../../api'; import Api from '../../api';
import state from '../state'; import state from '../state';
...@@ -9,6 +9,7 @@ import Dropdown from './dropdown.vue'; ...@@ -9,6 +9,7 @@ import Dropdown from './dropdown.vue';
export default { export default {
components: { components: {
GlLink, GlLink,
GlSprintf,
Dropdown, Dropdown,
}, },
props: { props: {
...@@ -38,15 +39,6 @@ export default { ...@@ -38,15 +39,6 @@ export default {
selectedProject() { selectedProject() {
return state.selectedProject; return state.selectedProject;
}, },
noForkText() {
return sprintf(
__(
"To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visibility to private.",
),
{ link_start: `<a href="${this.newForkPath}" class="help-link">`, link_end: '</a>' },
false,
);
},
}, },
mounted() { mounted() {
this.fetchProjects(); this.fetchProjects();
...@@ -123,8 +115,20 @@ export default { ...@@ -123,8 +115,20 @@ export default {
}} }}
</template> </template>
<template v-else> <template v-else>
{{ __('No forks available to you.') }}<br /> {{ __('No forks are available to you.') }}<br />
<span v-html="noForkText"></span> <gl-sprintf
:message="
__(
`To protect this issue's confidentiality, %{forkLink} and set the fork's visibility to private.`,
)
"
>
<template #forkLink>
<a :href="newForkPath" target="_blank" class="help-link">{{
__('fork this project')
}}</a>
</template>
</gl-sprintf>
</template> </template>
<gl-link <gl-link
:href="helpPagePath" :href="helpPagePath"
......
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
list-style: none; list-style: none;
padding: 0 1px; padding: 0 1px;
a, a:not(.help-link),
button, button,
.menu-item { .menu-item {
@include dropdown-link; @include dropdown-link;
......
...@@ -214,7 +214,6 @@ ul.related-merge-requests > li { ...@@ -214,7 +214,6 @@ ul.related-merge-requests > li {
} }
.create-merge-request-dropdown-menu { .create-merge-request-dropdown-menu {
width: 300px;
opacity: 1; opacity: 1;
visibility: visible; visibility: visible;
transform: translateY(0); transform: translateY(0);
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
%ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-right.gl-show-field-errors{ class: ("create-confidential-merge-request-dropdown-menu" if can_create_confidential_merge_request?), data: { dropdown: true } } %ul#create-merge-request-dropdown.create-merge-request-dropdown-menu.dropdown-menu.dropdown-menu-right.gl-show-field-errors{ class: ("create-confidential-merge-request-dropdown-menu" if can_create_confidential_merge_request?), data: { dropdown: true } }
- if can_create_merge_request - if can_create_merge_request
%li.droplab-item-selected{ role: 'button', data: { value: 'create-mr', text: create_mr_text } } %li.droplab-item-selected{ role: 'button', data: { value: 'create-mr', text: create_mr_text } }
.menu-item .menu-item.text-nowrap
= icon('check', class: 'icon') = icon('check', class: 'icon')
- if can_create_confidential_merge_request? - if can_create_confidential_merge_request?
= _('Create confidential merge request and branch') = _('Create confidential merge request and branch')
......
---
title: Improve create confidential MR dropdown styling.
merge_request: 20176
author: Lee Tickett
type: other
...@@ -11641,7 +11641,7 @@ msgstr "" ...@@ -11641,7 +11641,7 @@ msgstr ""
msgid "No files found." msgid "No files found."
msgstr "" msgstr ""
msgid "No forks available to you." msgid "No forks are available to you."
msgstr "" msgstr ""
msgid "No issues for the selected time period." msgid "No issues for the selected time period."
...@@ -18447,7 +18447,7 @@ msgstr "" ...@@ -18447,7 +18447,7 @@ msgstr ""
msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed." msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed."
msgstr "" msgstr ""
msgid "To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visibility to private." msgid "To protect this issue's confidentiality, %{forkLink} and set the fork's visibility to private."
msgstr "" msgstr ""
msgid "To protect this issue's confidentiality, a private fork of this project was selected." msgid "To protect this issue's confidentiality, a private fork of this project was selected."
...@@ -21049,6 +21049,9 @@ msgstr "" ...@@ -21049,6 +21049,9 @@ msgstr ""
msgid "for this project" msgid "for this project"
msgstr "" msgstr ""
msgid "fork this project"
msgstr ""
msgid "from" msgid "from"
msgstr "" msgstr ""
......
...@@ -29,7 +29,7 @@ describe 'User creates confidential merge request on issue page', :js do ...@@ -29,7 +29,7 @@ describe 'User creates confidential merge request on issue page', :js do
click_button 'Create confidential merge request' click_button 'Create confidential merge request'
page.within '.create-confidential-merge-request-dropdown-menu' do page.within '.create-confidential-merge-request-dropdown-menu' do
expect(page).to have_content('No forks available to you') expect(page).to have_content('No forks are available to you')
end end
end end
end end
......
...@@ -15,19 +15,12 @@ exports[`Confidential merge request project form group component renders empty s ...@@ -15,19 +15,12 @@ exports[`Confidential merge request project form group component renders empty s
class="text-muted mt-1 mb-0" class="text-muted mt-1 mb-0"
> >
No forks available to you. No forks are available to you.
<br /> <br />
<span> <glsprintf-stub
To protect this issue's confidentiality, message="To protect this issue's confidentiality, %{forkLink} and set the fork's visibility to private."
<a />
class="help-link"
href="https://test.com"
>
fork the project
</a>
and set the forks visibility to private.
</span>
<gllink-stub <gllink-stub
class="w-auto p-0 d-inline-block text-primary bg-transparent" class="w-auto p-0 d-inline-block text-primary bg-transparent"
...@@ -65,19 +58,12 @@ exports[`Confidential merge request project form group component renders fork dr ...@@ -65,19 +58,12 @@ exports[`Confidential merge request project form group component renders fork dr
class="text-muted mt-1 mb-0" class="text-muted mt-1 mb-0"
> >
No forks available to you. No forks are available to you.
<br /> <br />
<span> <glsprintf-stub
To protect this issue's confidentiality, message="To protect this issue's confidentiality, %{forkLink} and set the fork's visibility to private."
<a />
class="help-link"
href="https://test.com"
>
fork the project
</a>
and set the forks visibility to private.
</span>
<gllink-stub <gllink-stub
class="w-auto p-0 d-inline-block text-primary bg-transparent" class="w-auto p-0 d-inline-block text-primary bg-transparent"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment