Skip to content

G
gitlab-ce
Commit 99ed8fec authored by Nathan Friend's avatar Nathan Friend
Browse files
Options

Merge branch 'jh-remove_html_frontend_strings' into 'master' 

Remove direct HTML usage from the frontend strings

See merge request gitlab-org/gitlab!38196
parents 37135ccb e40d8efa
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 269 deletions
app/assets/javascripts/badges/components/badge_settings.vue
View file @ 99ed8fec
...@@ -6,6 +6,7 @@ import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; ...@@ -6,6 +6,7 @@ import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
import Badge from './badge.vue'; import Badge from './badge.vue';
import BadgeForm from './badge_form.vue'; import BadgeForm from './badge_form.vue';
import BadgeList from './badge_list.vue'; import BadgeList from './badge_list.vue';
import { GlSprintf } from '@gitlab/ui';
export default { export default {
name: 'BadgeSettings', name: 'BadgeSettings',
...@@ -14,14 +15,15 @@ export default { ...@@ -14,14 +15,15 @@ export default {
BadgeForm, BadgeForm,
BadgeList, BadgeList,
GlModal: DeprecatedModal2, GlModal: DeprecatedModal2,
GlSprintf,
},
i18n: {
deleteModalText: s__(
'Badges|You are going to delete this badge. Deleted badges %{strongStart}cannot%{strongEnd} be restored.',
),
}, },
computed: { computed: {
...mapState(['badgeInModal', 'isEditing']), ...mapState(['badgeInModal', 'isEditing']),
deleteModalText() {
return s__(
'Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored.',
);
},
}, },
methods: { methods: {
...mapActions(['deleteBadge']), ...mapActions(['deleteBadge']),
...@@ -54,7 +56,13 @@ export default { ...@@ -54,7 +56,13 @@ export default {
:link-url="badgeInModal ? badgeInModal.renderedLinkUrl : ''" :link-url="badgeInModal ? badgeInModal.renderedLinkUrl : ''"
/> />
</div> </div>
<p v-html="deleteModalText"></p> <p>
<gl-sprintf :message="$options.i18n.deleteModalText">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
</gl-sprintf>
</p>
</gl-modal> </gl-modal>
<badge-form v-show="isEditing" :is-editing="true" /> <badge-form v-show="isEditing" :is-editing="true" />
......
app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
View file @ 99ed8fec
<script> <script>
import { escape } from 'lodash'; import { escape } from 'lodash';
import { GlModal, GlButton, GlDeprecatedButton, GlFormInput } from '@gitlab/ui'; import { GlModal, GlButton, GlDeprecatedButton, GlFormInput, GlSprintf } from '@gitlab/ui';
import SplitButton from '~/vue_shared/components/split_button.vue'; import SplitButton from '~/vue_shared/components/split_button.vue';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import csrf from '~/lib/utils/csrf'; import csrf from '~/lib/utils/csrf';
...@@ -30,6 +30,7 @@ export default { ...@@ -30,6 +30,7 @@ export default {
GlButton, GlButton,
GlDeprecatedButton, GlDeprecatedButton,
GlFormInput, GlFormInput,
GlSprintf,
}, },
props: { props: {
clusterPath: { clusterPath: {
...@@ -67,18 +68,6 @@ export default { ...@@ -67,18 +68,6 @@ export default {
) )
: s__('ClusterIntegration|You are about to remove your cluster integration.'); : s__('ClusterIntegration|You are about to remove your cluster integration.');
}, },
warningToBeRemoved() {
return s__(`ClusterIntegration|
This will permanently delete the following resources:
<ul>
<li>All installed applications and related resources</li>
<li>The <code>gitlab-managed-apps</code> namespace</li>
<li>Any project namespaces</li>
<li><code>clusterroles</code></li>
<li><code>clusterrolebindings</code></li>
</ul>
`);
},
confirmationTextLabel() { confirmationTextLabel() {
return sprintf( return sprintf(
this.confirmCleanup this.confirmCleanup
...@@ -144,7 +133,27 @@ export default { ...@@ -144,7 +133,27 @@ export default {
> >
<template> <template>
<p>{{ warningMessage }}</p> <p>{{ warningMessage }}</p>
<div v-if="confirmCleanup" v-html="warningToBeRemoved"></div> <div v-if="confirmCleanup">
{{ s__('ClusterIntegration|This will permanently delete the following resources:') }}
<ul>
<li>
{{ s__('ClusterIntegration|All installed applications and related resources') }}
</li>
<li>
<gl-sprintf :message="s__('ClusterIntegration|The %{gitlabNamespace} namespace')">
<template #gitlabNamespace>
<!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
<code>{{ 'gitlab-managed-apps' }}</code>
</template>
</gl-sprintf>
</li>
<li>{{ s__('ClusterIntegration|Any project namespaces') }}</li>
<!-- eslint-disable @gitlab/vue-require-i18n-strings -->
<li><code>clusterroles</code></li>
<li><code>clusterrolebindings</code></li>
<!-- eslint-enable @gitlab/vue-require-i18n-strings -->
</ul>
</div>
<strong v-html="confirmationTextLabel"></strong> <strong v-html="confirmationTextLabel"></strong>
<form ref="form" :action="clusterPath" method="post" class="gl-mb-5"> <form ref="form" :action="clusterPath" method="post" class="gl-mb-5">
<input ref="method" type="hidden" name="_method" value="delete" /> <input ref="method" type="hidden" name="_method" value="delete" />
......
app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue
View file @ 99ed8fec
<script> <script>
import { escape } from 'lodash';
import { mapState, mapGetters, mapActions } from 'vuex'; import { mapState, mapGetters, mapActions } from 'vuex';
import { s__, sprintf } from '~/locale'; import { s__ } from '~/locale';
import { GlSprintf, GlLink } from '@gitlab/ui';
import gkeDropdownMixin from './gke_dropdown_mixin'; import gkeDropdownMixin from './gke_dropdown_mixin';
export default { export default {
name: 'GkeProjectIdDropdown', name: 'GkeProjectIdDropdown',
components: {
GlSprintf,
GlLink,
},
mixins: [gkeDropdownMixin], mixins: [gkeDropdownMixin],
props: { props: {
docsUrl: { docsUrl: {
...@@ -46,31 +50,23 @@ export default { ...@@ -46,31 +50,23 @@ export default {
return s__('ClusterIntegration|Select project'); return s__('ClusterIntegration|Select project');
}, },
helpText() { helpText() {
let message;
if (this.hasErrors) { if (this.hasErrors) {
return this.errorMessage; return this.errorMessage;
} }
if (!this.items) { if (!this.items) {
message = return s__(
'ClusterIntegration|We were unable to fetch any projects. Ensure that you have a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.'; 'ClusterIntegration|We were unable to fetch any projects. Ensure that you have a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.',
);
} }
message = return this.items.length
this.items && this.items.length ? s__(
? 'ClusterIntegration|To use a new project, first create one on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.' 'ClusterIntegration|To use a new project, first create one on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.',
: 'ClusterIntegration|To create a cluster, first create a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.'; )
: s__(
return sprintf( 'ClusterIntegration|To create a cluster, first create a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}.',
s__(message), );
{
docsLinkEnd: '&nbsp;<i class="fa fa-external-link" aria-hidden="true"></i></a>',
docsLinkStart: `<a href="${escape(
this.docsUrl,
)}" target="_blank" rel="noopener noreferrer">`,
},
false,
);
}, },
errorMessage() { errorMessage() {
if (!this.projectHasBillingEnabled) { if (!this.projectHasBillingEnabled) {
...@@ -80,21 +76,13 @@ export default { ...@@ -80,21 +76,13 @@ export default {
); );
} }
return sprintf( return s__(
s__( 'ClusterIntegration|This project does not have billing enabled. To create a cluster, %{linkToBillingStart}enable billing%{linkToBillingEnd} and try again.',
'This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target="_blank" rel="noopener noreferrer">enable billing <i class="fa fa-external-link" aria-hidden="true"></i></a> and try again.',
),
{
linkToBilling:
'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral',
},
false,
); );
} }
return sprintf( return s__(
s__('ClusterIntegration|An error occurred while trying to fetch your projects: %{error}'), 'ClusterIntegration|An error occurred while trying to fetch your projects: %{error}',
{ error: this.gapiError },
); );
}, },
}, },
...@@ -182,7 +170,28 @@ export default { ...@@ -182,7 +170,28 @@ export default {
'text-muted': !hasErrors, 'text-muted': !hasErrors,
}" }"
class="form-text" class="form-text"
v-html="helpText" >
></span> <gl-sprintf :message="helpText">
<template #linkToBilling="{ content }">
<gl-link
:href="
'https://console.cloud.google.com/freetrial?utm_campaign=2018_cpanel&utm_source=gitlab&utm_medium=referral'
"
target="_blank"
>{{ content }} <i class="fa fa-external-link" aria-hidden="true"></i
></gl-link>
</template>
<template #docsLink="{ content }">
<gl-link :href="docsUrl" target="_blank"
>{{ content }} <i class="fa fa-external-link" aria-hidden="true"></i
></gl-link>
</template>
<template #error>
{{ gapiError }}
</template>
</gl-sprintf>
</span>
</div> </div>
</template> </template>
app/assets/javascripts/ide/stores/modules/terminal/messages.js
View file @ 99ed8fec
...@@ -21,7 +21,7 @@ export const EMPTY_RUNNERS = __( ...@@ -21,7 +21,7 @@ export const EMPTY_RUNNERS = __(
'Configure GitLab runners to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}', 'Configure GitLab runners to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}',
); );
export const ERROR_CONFIG = __( export const ERROR_CONFIG = __(
'Configure a <code>.gitlab-webide.yml</code> file in the <code>.gitlab</code> directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}', 'Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}',
); );
export const ERROR_PERMISSION = __( export const ERROR_PERMISSION = __(
'You do not have permission to run the Web Terminal. Please contact a project administrator.', 'You do not have permission to run the Web Terminal. Please contact a project administrator.',
...@@ -34,6 +34,8 @@ export const configCheckError = (status, helpUrl) => { ...@@ -34,6 +34,8 @@ export const configCheckError = (status, helpUrl) => {
{ {
helpStart: `<a href="${escape(helpUrl)}" target="_blank">`, helpStart: `<a href="${escape(helpUrl)}" target="_blank">`,
helpEnd: '</a>', helpEnd: '</a>',
codeStart: '<code>',
codeEnd: '</code>',
}, },
false, false,
); );
......
app/assets/javascripts/onboarding_issues/index.js
View file @ 99ed8fec
import $ from 'jquery'; import $ from 'jquery';
import { parseBoolean, getCookie, setCookie, removeCookie } from '~/lib/utils/common_utils'; import { parseBoolean, getCookie, setCookie, removeCookie } from '~/lib/utils/common_utils';
import { __ } from '~/locale'; import { __, sprintf } from '~/locale';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
const COOKIE_NAME = 'onboarding_issues_settings'; const COOKIE_NAME = 'onboarding_issues_settings';
...@@ -94,8 +94,12 @@ export const showLearnGitLabProjectPopover = () => { ...@@ -94,8 +94,12 @@ export const showLearnGitLabProjectPopover = () => {
if (!el) return; if (!el) return;
const options = { const options = {
content: __( content: sprintf(
'Go to <strong>Issues</strong> > <strong>Boards</strong> to access your personalized learning issue board.', __(
'Go to %{strongStart}Issues%{strongEnd} &gt; %{strongStart}Boards%{strongEnd} to access your personalized learning issue board.',
),
{ strongStart: '<strong>', strongEnd: '</strong>' },
false,
), ),
}; };
...@@ -111,8 +115,12 @@ export const showLearnGitLabIssuesPopover = () => { ...@@ -111,8 +115,12 @@ export const showLearnGitLabIssuesPopover = () => {
if (!el) return; if (!el) return;
const options = { const options = {
content: __( content: sprintf(
'Go to <strong>Issues</strong> > <strong>Boards</strong> to access your personalized learning issue board.', __(
'Go to %{strongStart}Issues%{strongEnd} &gt; %{strongStart}Boards%{strongEnd} to access your personalized learning issue board.',
),
{ strongStart: '<strong>', strongEnd: '</strong>' },
false,
), ),
}; };
......
app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
View file @ 99ed8fec
<script> <script>
import { escape } from 'lodash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import createFlash from '~/flash'; import createFlash from '~/flash';
import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import { visitUrl } from '~/lib/utils/url_utility'; import { visitUrl } from '~/lib/utils/url_utility';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import { GlSprintf } from '@gitlab/ui';
export default { export default {
components: { components: {
GlModal: DeprecatedModal2, GlModal: DeprecatedModal2,
GlSprintf,
}, },
props: { props: {
url: { url: {
...@@ -45,20 +46,6 @@ export default { ...@@ -45,20 +46,6 @@ export default {
}, },
); );
}, },
title() {
const label = `<span
class="label color-label"
style="background-color: ${this.labelColor}; color: ${this.labelTextColor};"
>${escape(this.labelTitle)}</span>`;
return sprintf(
s__('Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>'),
{
labelTitle: label,
},
false,
);
},
}, },
methods: { methods: {
onSubmit() { onSubmit() {
...@@ -90,7 +77,27 @@ export default { ...@@ -90,7 +77,27 @@ export default {
footer-primary-button-variant="warning" footer-primary-button-variant="warning"
@submit="onSubmit" @submit="onSubmit"
> >
<div slot="title" class="modal-title-with-label" v-html="title"></div> <div slot="title" class="modal-title-with-label">
<gl-sprintf
:message="
s__(
'Labels|%{spanStart}Promote label%{spanEnd} %{labelTitle} %{spanStart}to Group Label?%{spanEnd}',
)
"
>
<template #labelTitle>
<span
class="label color-label"
:style="`background-color: ${labelColor}; color: ${labelTextColor};`"
>
{{ labelTitle }}
</span>
</template>
<template #span="{ content }"
><span>{{ content }}</span></template
>
</gl-sprintf>
</div>
{{ text }} {{ text }}
</gl-modal> </gl-modal>
......
app/assets/javascripts/prometheus_metrics/prometheus_metrics.js
View file @ 99ed8fec
...@@ -87,16 +87,15 @@ export default class PrometheusMetrics { ...@@ -87,16 +87,15 @@ export default class PrometheusMetrics {
if (totalMonitoredMetrics === 0) { if (totalMonitoredMetrics === 0) {
const emptyCommonMetricsText = sprintf( const emptyCommonMetricsText = sprintf(
s__( s__('PrometheusService|No %{docsUrlStart}common metrics%{docsUrlEnd} were found'),
'PrometheusService|<p class="text-tertiary">No <a href="%{docsUrl}">common metrics</a> were found</p>',
),
{ {
docsUrl: this.helpMetricsPath, docsUrlStart: `<a href="${this.helpMetricsPath}">`,
docsUrlEnd: '</a>',
}, },
false, false,
); );
this.$monitoredMetricsEmpty.empty(); this.$monitoredMetricsEmpty.empty();
this.$monitoredMetricsEmpty.append(emptyCommonMetricsText); this.$monitoredMetricsEmpty.append(`<p class="text-tertiary">${emptyCommonMetricsText}</p>`);
this.showMonitoringMetricsPanelState(PANEL_STATE.EMPTY); this.showMonitoringMetricsPanelState(PANEL_STATE.EMPTY);
} else { } else {
const metricsCountText = sprintf( const metricsCountText = sprintf(
......
app/assets/javascripts/sidebar/components/confidential/edit_form.vue
View file @ 99ed8fec
<script> <script>
import editFormButtons from './edit_form_buttons.vue'; import editFormButtons from './edit_form_buttons.vue';
import { __, sprintf } from '../../../locale'; import { __ } from '../../../locale';
import { GlSprintf } from '@gitlab/ui';
export default { export default {
components: { components: {
editFormButtons, editFormButtons,
GlSprintf,
}, },
props: { props: {
confidential: { confidential: {
...@@ -22,25 +24,13 @@ export default { ...@@ -22,25 +24,13 @@ export default {
}, },
computed: { computed: {
confidentialityOnWarning() { confidentialityOnWarning() {
const accessLevel = __('at least Reporter access'); return __(
'You are going to turn on the confidentiality. This means that only team members with %{strongStart}at least Reporter access%{strongEnd} are able to see and leave comments on the %{issuableType}.',
return sprintf(
__(
'You are going to turn on the confidentiality. This means that only team members with %{accessLevel} are able to see and leave comments on the %{issuableType}.',
),
{ issuableType: this.issuableType, accessLevel: `<strong>${accessLevel}</strong>` },
false,
); );
}, },
confidentialityOffWarning() { confidentialityOffWarning() {
const accessLevel = __('everyone'); return __(
'You are going to turn off the confidentiality. This means %{strongStart}everyone%{strongEnd} will be able to see and leave a comment on this %{issuableType}.',
return sprintf(
__(
'You are going to turn off the confidentiality. This means %{accessLevel} will be able to see and leave a comment on this %{issuableType}.',
),
{ issuableType: this.issuableType, accessLevel: `<strong>${accessLevel}</strong>` },
false,
); );
}, },
}, },
...@@ -51,8 +41,22 @@ export default { ...@@ -51,8 +41,22 @@ export default {
<div class="dropdown show"> <div class="dropdown show">
<div class="dropdown-menu sidebar-item-warning-message"> <div class="dropdown-menu sidebar-item-warning-message">
<div> <div>
<p v-if="!confidential" v-html="confidentialityOnWarning"></p> <p v-if="!confidential">
<p v-else v-html="confidentialityOffWarning"></p> <gl-sprintf :message="confidentialityOnWarning">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
<template #issuableType>{{ issuableType }}</template>
</gl-sprintf>
</p>
<p v-else>
<gl-sprintf :message="confidentialityOffWarning">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
<template #issuableType>{{ issuableType }}</template>
</gl-sprintf>
</p>
<edit-form-buttons :full-path="fullPath" :confidential="confidential" /> <edit-form-buttons :full-path="fullPath" :confidential="confidential" />
</div> </div>
</div> </div>
......
app/assets/javascripts/sidebar/components/lock/edit_form.vue
View file @ 99ed8fec
<script> <script>
import editFormButtons from './edit_form_buttons.vue'; import editFormButtons from './edit_form_buttons.vue';
import { __, sprintf } from '../../../locale'; import { GlSprintf } from '@gitlab/ui';
export default { export default {
components: { components: {
editFormButtons, editFormButtons,
GlSprintf,
}, },
props: { props: {
isLocked: { isLocked: {
...@@ -16,33 +17,41 @@ export default { ...@@ -16,33 +17,41 @@ export default {
type: String, type: String,
}, },
}, },
computed: {
lockWarning() {
return sprintf(
__(
'Lock this %{issuableDisplayName}? Only <strong>project members</strong> will be able to comment.',
),
{ issuableDisplayName: this.issuableDisplayName },
);
},
unlockWarning() {
return sprintf(
__(
'Unlock this %{issuableDisplayName}? <strong>Everyone</strong> will be able to comment.',
),
{ issuableDisplayName: this.issuableDisplayName },
);
},
},
}; };
</script> </script>
<template> <template>
<div class="dropdown show"> <div class="dropdown show">
<div class="dropdown-menu sidebar-item-warning-message" data-testid="warning-text"> <div class="dropdown-menu sidebar-item-warning-message" data-testid="warning-text">
<p v-if="isLocked" class="text" v-html="unlockWarning"></p> <p v-if="isLocked" class="text">
<gl-sprintf
:message="
__(
'Unlock this %{issuableDisplayName}? %{strongStart}Everyone%{strongEnd} will be able to comment.',
)
"
>
<template #issuableDisplayName>{{ issuableDisplayName }}</template>
<template #strong="{ content }"
><strong>{{ content }}</strong></template
>
</gl-sprintf>
</p>
<p v-else class="text" v-html="lockWarning"></p> <p v-else class="text">
<gl-sprintf
:message="
__(
'Lock this %{issuableDisplayName}? Only %{strongStart}project members%{strongEnd} will be able to comment.',
)
"
>
<template #issuableDisplayName>{{ issuableDisplayName }}</template>
<template #strong="{ content }"
><strong>{{ content }}</strong></template
>
</gl-sprintf>
</p>
<edit-form-buttons :is-locked="isLocked" :issuable-display-name="issuableDisplayName" /> <edit-form-buttons :is-locked="isLocked" :issuable-display-name="issuableDisplayName" />
</div> </div>
......
app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue
View file @ 99ed8fec
<script> <script>
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import { __ } from '../../locale'; import { __ } from '../../locale';
import { GlSprintf } from '@gitlab/ui';
export default { export default {
i18n: {
removesBranchText: __('%{strongStart}Deletes%{strongEnd} source branch'),
tooltipTitle: __('A user with write access to the source branch selected this option'),
},
components: {
GlSprintf,
},
directives: { directives: {
tooltip, tooltip,
}, },
created() {
this.removesBranchText = __('<strong>Deletes</strong> source branch');
this.tooltipTitle = __('A user with write access to the source branch selected this option');
},
}; };
</script> </script>
<template> <template>
<p v-once class="mr-info-list mr-links gl-mb-0"> <p v-once class="mr-info-list mr-links gl-mb-0">
<span class="status-text" v-html="removesBranchText"> </span> <span class="status-text">
<i v-tooltip :title="tooltipTitle" :aria-label="tooltipTitle" class="fa fa-question-circle"> <gl-sprintf :message="$options.i18n.removesBranchText">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
</gl-sprintf>
</span>
<i
v-tooltip
:title="$options.i18n.tooltipTitle"
:aria-label="$options.i18n.tooltipTitle"
class="fa fa-question-circle"
>
</i> </i>
</p> </p>
</template> </template>
ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue
View file @ 99ed8fec
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
import { componentNames } from 'ee/reports/components/issue_body'; import { componentNames } from 'ee/reports/components/issue_body';
import ReportSection from '~/reports/components/report_section.vue'; import ReportSection from '~/reports/components/report_section.vue';
import { status as reportStatus } from '~/reports/constants'; import { status as reportStatus } from '~/reports/constants';
import { n__ } from '~/locale'; import { n__, sprintf } from '~/locale';
import { GlSprintf } from '@gitlab/ui';
export default { export default {
name: 'BlockingMergeRequestsReport', name: 'BlockingMergeRequestsReport',
components: { ReportSection }, components: { ReportSection, GlSprintf },
props: { props: {
mr: { mr: {
type: Object, type: Object,
...@@ -64,10 +65,13 @@ export default { ...@@ -64,10 +65,13 @@ export default {
}, },
blockedByText() { blockedByText() {
if (this.closedCount > 0 && this.closedCount === this.unmergedCount) { if (this.closedCount > 0 && this.closedCount === this.unmergedCount) {
return n__( return sprintf(
'Depends on <strong>%d closed</strong> merge request.', n__(
'Depends on <strong>%d closed</strong> merge requests.', 'Depends on %{strongStart}%{closedCount} closed%{strongEnd} merge request.',
this.closedCount, 'Depends on %{strongStart}%{closedCount} closed%{strongEnd} merge requests.',
this.closedCount,
),
{ closedCount: this.closedCount },
); );
} }
...@@ -114,7 +118,13 @@ export default { ...@@ -114,7 +118,13 @@ export default {
</span> </span>
</template> </template>
<template #error> <template #error>
<span v-html="blockedByText"></span> <span>
<gl-sprintf :message="blockedByText">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
</gl-sprintf>
</span>
</template> </template>
</report-section> </report-section>
</template> </template>
ee/spec/frontend/vue_mr_widget/components/blocking_merge_requests/blocking_merge_requests_report_spec.js
View file @ 99ed8fec
...@@ -103,7 +103,7 @@ describe('BlockingMergeRequestsReport', () => { ...@@ -103,7 +103,7 @@ describe('BlockingMergeRequestsReport', () => {
createComponent(); createComponent();
expect(wrapper.vm.blockedByText).toEqual( expect(wrapper.vm.blockedByText).toEqual(
'Depends on <strong>1 closed</strong> merge request.', 'Depends on %{strongStart}1 closed%{strongEnd} merge request.',
); );
}); });
}); });
......
lib/gitlab/i18n/html_todo.yml
View file @ 99ed8fec
...@@ -76,6 +76,102 @@ ...@@ -76,6 +76,102 @@
- "< 1 saat" - "< 1 saat"
- "< 1 Stunde" - "< 1 Stunde"
- "< 1시간" - "< 1시간"
#
# Strings below are fixed in the source code but the translations are still present in CrowdIn so the
# locale files will fail the linter. They can be deleted after next CrowdIn sync, likely in:
# https://gitlab.com/gitlab-org/gitlab/-/issues/226008
#
"This commit was signed with an <strong>unverified</strong> signature.":
plural_id:
translations:
- "このコミットは<strong>検証されていない</strong> 署名でサインされています。"
- "Этот коммит был подписан <strong>непроверенной</strong> подписью."
- "此提交使用 <strong>未经验证的</strong> 签名进行签名。"
- "Цей коміт підписано <strong>неперевіреним</strong> підписом."
- "Esta commit fue firmado con una firma <strong>no verificada</strong>."
"This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.":
plural_id:
translations:
- "このコミットは <strong>検証済み</strong> の署名でサインされており、このコミッターのメールは同じユーザーのものであることが検証されています。"
- "Это коммит был подписан <strong>верифицированной</strong> подписью и коммитер подтвердил, что адрес почты принадлежит ему."
- "此提交使用 <strong>已验证</strong> 的签名进行签名，并且已验证提交者的电子邮件属于同一用户。"
- "Цей коміт підписано <strong>перевіреним</strong> підписом і адреса електронної пошти комітера гарантовано належить тому самому користувачу."
- "Este commit fue firmado con una firma verificada, y <strong>se ha verificado</strong> que la dirección de correo electrónico del committer y la firma pertenecen al mismo usuario."
"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}":
plural_id:
translations:
- "分支 <strong>%{branch_name}</strong> 已創建。如需設置自動部署， 請選擇合適的 GitLab CI Yaml 模板併提交更改。%{link_to_autodeploy_doc}"
- "O branch <strong>%{branch_name}</strong> foi criado. Para configurar o deploy automático, selecione um modelo de Yaml do GitLab CI e commit suas mudanças. %{link_to_autodeploy_doc}"
- "<strong>%{branch_name}</strong> ブランチが作成されました。自動デプロイを設定するには、GitLab CI Yaml テンプレートを選択して、変更をコミットしてください。 %{link_to_autodeploy_doc}"
- "La branch <strong>%{branch_name}</strong> è stata creata. Per impostare un rilascio automatico scegli un template CI di Gitlab e committa le tue modifiche %{link_to_autodeploy_doc}"
- "O ramo <strong>%{branch_name}</strong> foi criado. Para configurar a implantação automática, seleciona um modelo de Yaml do GitLab CI e envia as tuas alterações. %{link_to_autodeploy_doc}"
- "Ветка <strong>%{branch_name}</strong> создана. Для настройки автоматического развертывания выберите YAML-шаблон для GitLab CI и зафиксируйте свои изменения. %{link_to_autodeploy_doc}"
- "已创建分支 <strong>%{branch_name}</strong> 。如需设置自动部署， 请选择合适的 GitLab CI Yaml 模板并提交更改。%{link_to_autodeploy_doc}"
- "Гілка <strong>%{branch_name}</strong> створена. Для настройки автоматичного розгортання виберіть GitLab CI Yaml-шаблон і закомітьте зміни. %{link_to_autodeploy_doc}"
- "Клонът <strong>%{branch_name}</strong> беше създаден. За да настроите автоматичното внедряване, изберете Yaml шаблон за GitLab CI и подайте промените си. %{link_to_autodeploy_doc}"
- "Branch <strong>%{branch_name}</strong> wurde erstellt. Um die automatische Bereitstellung einzurichten, wähle eine GitLab CI Yaml Vorlage und committe deine Änderungen. %{link_to_autodeploy_doc}"
- "<strong>%{branch_name}</strong> 브랜치가 생성되었습니다. 자동 배포를 설정하려면 GitLab CI Yaml 템플릿을 선택하고 변경 사항을 적용하십시오. %{link_to_autodeploy_doc}"
- "La branĉo <strong>%{branch_name}</strong> estis kreita. Por agordi aŭtomatan disponigadon, bonvolu elekti Yaml-ŝablonon por GitLab CI kaj enmeti viajn ŝanĝojn. %{link_to_autodeploy_doc}"
- "La branche <strong>%{branch_name}</strong> a été créée. Pour mettre en place le déploiement automatisé, sélectionnez un modèle de fichier YAML pour l’intégration continue (CI) de GitLab, et validez les modifications. %{link_to_autodeploy_doc}"
- "La rama <strong>%{branch_name}</strong> fue creada. Para configurar el auto despliegue, escoge una plantilla Yaml para GitLab CI y envía tus cambios. %{link_to_autodeploy_doc}"
"GitLabPages|GitLab Pages are disabled for this project. You can enable them on your project's %{strong_start}Settings > General > Visibility%{strong_end} page.":
plural_id:
translations:
- "GitLab Pagesはこのプロジェクトでは無効になっています。 プロジェクトの%{strong_start} 設定> 全般> 可視性%{strong_end}ページで有効にできます。"
- "GitLab Pages отключены для этого проекта. Вы можете включить в поле %{strong_start}Настройки > Общие > Видимость%{strong_end} вашего проекта."
- "此项目禁用GitLab Pages。您可以在您的项目的%{strong_start}设置 > 常规 > 可见性%{strong_end} 页面启用。"
- "GitLab Pages вимкнено для цього проєкту. Ви можете їх увімкнути перейшовши на сторінку проєкту %{strong_start}Налаштування > Загальні > Видимість%{strong_end}."
- "Las páginas de GitLab están deshabilitadas para este proyecto. Puede habilitarlas en los ajustes %{strong_start} de su proyecto > General > Visibilidad%{strong_end}."
"You can invite a new member to <strong>%{project_name}</strong> or invite another group.":
plural_id:
translations:
- "新しいメンバーを<strong>%{project_name} </strong>に招待するか、別のグループを招待することができます。"
- "Podes convidar um novo para <strong>%{project_name}</strong> ou convidar outro grupo."
- "邀请新成员或另一个群组加入<strong>%{project_name}</strong>。"
- "Puede invitar a un nuevo miembro a <strong>%{project_name}</strong> o invitar a otro grupo."
- "<strong>%{project_name}</strong> projesine yeni bir üye davet edebilir veya başka bir grubu davet edebilirsiniz."
- "Вы можете пригласить нового участника в <strong>%{project_name}</strong> или пригласить другую группу."
- "Ви можете запросити нового учасника до <strong>%{project_name}</strong> або запросити іншу групу."
"You can invite a new member to <strong>%{project_name}</strong>.":
plural_id:
translations:
- "新しいメンバーを<strong>%{project_name} </strong>に招待できます。"
- "Podes convidar um novo membro para <strong>%{project_name}</strong>."
- "邀请新成员加入<strong>%{project_name}</strong>。"
- "Puedes invitar a un nuevo miembro a <strong>%{project_name}</strong>."
- "<strong>%{project_name}</strong> projesine yeni bir üye davet edebilirsiniz."
- "Вы можете пригласить нового участника в <strong>%{project_name}</strong>."
- "Ви можете запросити нового учасника до <strong>%{project_name}</strong>."
"You can invite another group to <strong>%{project_name}</strong>.":
plural_id:
translations:
- "他のグループを<strong>%{project_name} </strong>に招待できます。"
- "Podes convidar outro grupo para <strong>%{project_name}</strong>."
- "您可以邀请另一个群组加入<strong>%{project_name}</strong>。"
- "Ви можете запросити нову групу до <strong>%{project_name}</strong>."
- "Puedes invitar a otro grupo a <strong>%{project_name}</strong>."
"Example: <code>192.168.0.0/24</code>. %{read_more_link}.":
plural_id:
translations:
"Note that PostgreSQL %{pg_version_upcoming} will become the minimum required version in GitLab %{gl_version_upcoming} (%{gl_version_upcoming_date}). Please consider upgrading your environment to a supported PostgreSQL version soon, see <a href=\\\"%{pg_version_upcoming_url}\\\">the related epic</a> for details.":
plural_id:
translations:
"Authorize <strong>%{user}</strong> to use your account?":
plural_id:
translations:
"DeployFreeze|Specify times when deployments are not allowed for an environment. The <code>gitlab-ci.yml</code> file must be updated to make deployment jobs aware of the %{freeze_period_link_start}freeze period%{freeze_period_link_end}.":
plural_id:
translations:
"<project name>":
translations:
- "<название проекта>"
- "<project name>"
- "<proje adı>"
- "<naziv projekta>"
- "<ім’я проєкту>"
- "<프로젝트 이름>"
"<strong>Deletes</strong> source branch": "<strong>Deletes</strong> source branch":
plural_id: plural_id:
translations: translations:
...@@ -217,99 +313,3 @@ ...@@ -217,99 +313,3 @@
- "Vous êtes sur le point de d’activer la confidentialité. Cela signifie que seuls les membres de l’équipe avec <strong>au moins un accès en tant que rapporteur</strong> seront en mesure de voir et de laisser des commentaires sur le ticket." - "Vous êtes sur le point de d’activer la confidentialité. Cela signifie que seuls les membres de l’équipe avec <strong>au moins un accès en tant que rapporteur</strong> seront en mesure de voir et de laisser des commentaires sur le ticket."
- "Va a activar la confidencialidad. Esto significa que solo los miembros del equipo con como mínimo,<strong>acceso como Reporter</strong> podrán ver y dejar comentarios sobre la incidencia." - "Va a activar la confidencialidad. Esto significa que solo los miembros del equipo con como mínimo,<strong>acceso como Reporter</strong> podrán ver y dejar comentarios sobre la incidencia."
- "あなたは非公開設定をオンにしようとしています。これは、最低でも<strong>報告権限</strong>を持ったチームメンバーのみが課題を表示したりコメントを残したりすることができるようになるということです。" - "あなたは非公開設定をオンにしようとしています。これは、最低でも<strong>報告権限</strong>を持ったチームメンバーのみが課題を表示したりコメントを残したりすることができるようになるということです。"
#
# Strings below are fixed in the source code but the translations are still present in CrowdIn so the
# locale files will fail the linter. They can be deleted after next CrowdIn sync, likely in:
# https://gitlab.com/gitlab-org/gitlab/-/issues/226008
#
"This commit was signed with an <strong>unverified</strong> signature.":
plural_id:
translations:
- "このコミットは<strong>検証されていない</strong> 署名でサインされています。"
- "Этот коммит был подписан <strong>непроверенной</strong> подписью."
- "此提交使用 <strong>未经验证的</strong> 签名进行签名。"
- "Цей коміт підписано <strong>неперевіреним</strong> підписом."
- "Esta commit fue firmado con una firma <strong>no verificada</strong>."
"This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.":
plural_id:
translations:
- "このコミットは <strong>検証済み</strong> の署名でサインされており、このコミッターのメールは同じユーザーのものであることが検証されています。"
- "Это коммит был подписан <strong>верифицированной</strong> подписью и коммитер подтвердил, что адрес почты принадлежит ему."
- "此提交使用 <strong>已验证</strong> 的签名进行签名，并且已验证提交者的电子邮件属于同一用户。"
- "Цей коміт підписано <strong>перевіреним</strong> підписом і адреса електронної пошти комітера гарантовано належить тому самому користувачу."
- "Este commit fue firmado con una firma verificada, y <strong>se ha verificado</strong> que la dirección de correo electrónico del committer y la firma pertenecen al mismo usuario."
"Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}":
plural_id:
translations:
- "分支 <strong>%{branch_name}</strong> 已創建。如需設置自動部署， 請選擇合適的 GitLab CI Yaml 模板併提交更改。%{link_to_autodeploy_doc}"
- "O branch <strong>%{branch_name}</strong> foi criado. Para configurar o deploy automático, selecione um modelo de Yaml do GitLab CI e commit suas mudanças. %{link_to_autodeploy_doc}"
- "<strong>%{branch_name}</strong> ブランチが作成されました。自動デプロイを設定するには、GitLab CI Yaml テンプレートを選択して、変更をコミットしてください。 %{link_to_autodeploy_doc}"
- "La branch <strong>%{branch_name}</strong> è stata creata. Per impostare un rilascio automatico scegli un template CI di Gitlab e committa le tue modifiche %{link_to_autodeploy_doc}"
- "O ramo <strong>%{branch_name}</strong> foi criado. Para configurar a implantação automática, seleciona um modelo de Yaml do GitLab CI e envia as tuas alterações. %{link_to_autodeploy_doc}"
- "Ветка <strong>%{branch_name}</strong> создана. Для настройки автоматического развертывания выберите YAML-шаблон для GitLab CI и зафиксируйте свои изменения. %{link_to_autodeploy_doc}"
- "已创建分支 <strong>%{branch_name}</strong> 。如需设置自动部署， 请选择合适的 GitLab CI Yaml 模板并提交更改。%{link_to_autodeploy_doc}"
- "Гілка <strong>%{branch_name}</strong> створена. Для настройки автоматичного розгортання виберіть GitLab CI Yaml-шаблон і закомітьте зміни. %{link_to_autodeploy_doc}"
- "Клонът <strong>%{branch_name}</strong> беше създаден. За да настроите автоматичното внедряване, изберете Yaml шаблон за GitLab CI и подайте промените си. %{link_to_autodeploy_doc}"
- "Branch <strong>%{branch_name}</strong> wurde erstellt. Um die automatische Bereitstellung einzurichten, wähle eine GitLab CI Yaml Vorlage und committe deine Änderungen. %{link_to_autodeploy_doc}"
- "<strong>%{branch_name}</strong> 브랜치가 생성되었습니다. 자동 배포를 설정하려면 GitLab CI Yaml 템플릿을 선택하고 변경 사항을 적용하십시오. %{link_to_autodeploy_doc}"
- "La branĉo <strong>%{branch_name}</strong> estis kreita. Por agordi aŭtomatan disponigadon, bonvolu elekti Yaml-ŝablonon por GitLab CI kaj enmeti viajn ŝanĝojn. %{link_to_autodeploy_doc}"
- "La branche <strong>%{branch_name}</strong> a été créée. Pour mettre en place le déploiement automatisé, sélectionnez un modèle de fichier YAML pour l’intégration continue (CI) de GitLab, et validez les modifications. %{link_to_autodeploy_doc}"
- "La rama <strong>%{branch_name}</strong> fue creada. Para configurar el auto despliegue, escoge una plantilla Yaml para GitLab CI y envía tus cambios. %{link_to_autodeploy_doc}"
"GitLabPages|GitLab Pages are disabled for this project. You can enable them on your project's %{strong_start}Settings > General > Visibility%{strong_end} page.":
plural_id:
translations:
- "GitLab Pagesはこのプロジェクトでは無効になっています。 プロジェクトの%{strong_start} 設定> 全般> 可視性%{strong_end}ページで有効にできます。"
- "GitLab Pages отключены для этого проекта. Вы можете включить в поле %{strong_start}Настройки > Общие > Видимость%{strong_end} вашего проекта."
- "此项目禁用GitLab Pages。您可以在您的项目的%{strong_start}设置 > 常规 > 可见性%{strong_end} 页面启用。"
- "GitLab Pages вимкнено для цього проєкту. Ви можете їх увімкнути перейшовши на сторінку проєкту %{strong_start}Налаштування > Загальні > Видимість%{strong_end}."
- "Las páginas de GitLab están deshabilitadas para este proyecto. Puede habilitarlas en los ajustes %{strong_start} de su proyecto > General > Visibilidad%{strong_end}."
"You can invite a new member to <strong>%{project_name}</strong> or invite another group.":
plural_id:
translations:
- "新しいメンバーを<strong>%{project_name} </strong>に招待するか、別のグループを招待することができます。"
- "Podes convidar um novo para <strong>%{project_name}</strong> ou convidar outro grupo."
- "邀请新成员或另一个群组加入<strong>%{project_name}</strong>。"
- "Puede invitar a un nuevo miembro a <strong>%{project_name}</strong> o invitar a otro grupo."
- "<strong>%{project_name}</strong> projesine yeni bir üye davet edebilir veya başka bir grubu davet edebilirsiniz."
- "Вы можете пригласить нового участника в <strong>%{project_name}</strong> или пригласить другую группу."
- "Ви можете запросити нового учасника до <strong>%{project_name}</strong> або запросити іншу групу."
"You can invite a new member to <strong>%{project_name}</strong>.":
plural_id:
translations:
- "新しいメンバーを<strong>%{project_name} </strong>に招待できます。"
- "Podes convidar um novo membro para <strong>%{project_name}</strong>."
- "邀请新成员加入<strong>%{project_name}</strong>。"
- "Puedes invitar a un nuevo miembro a <strong>%{project_name}</strong>."
- "<strong>%{project_name}</strong> projesine yeni bir üye davet edebilirsiniz."
- "Вы можете пригласить нового участника в <strong>%{project_name}</strong>."
- "Ви можете запросити нового учасника до <strong>%{project_name}</strong>."
"You can invite another group to <strong>%{project_name}</strong>.":
plural_id:
translations:
- "他のグループを<strong>%{project_name} </strong>に招待できます。"
- "Podes convidar outro grupo para <strong>%{project_name}</strong>."
- "您可以邀请另一个群组加入<strong>%{project_name}</strong>。"
- "Ви можете запросити нову групу до <strong>%{project_name}</strong>."
- "Puedes invitar a otro grupo a <strong>%{project_name}</strong>."
"Example: <code>192.168.0.0/24</code>. %{read_more_link}.":
plural_id:
translations:
"Note that PostgreSQL %{pg_version_upcoming} will become the minimum required version in GitLab %{gl_version_upcoming} (%{gl_version_upcoming_date}). Please consider upgrading your environment to a supported PostgreSQL version soon, see <a href=\\\"%{pg_version_upcoming_url}\\\">the related epic</a> for details.":
plural_id:
translations:
"Authorize <strong>%{user}</strong> to use your account?":
plural_id:
translations:
"DeployFreeze|Specify times when deployments are not allowed for an environment. The <code>gitlab-ci.yml</code> file must be updated to make deployment jobs aware of the %{freeze_period_link_start}freeze period%{freeze_period_link_end}.":
plural_id:
translations:
"<project name>":
translations:
- "<название проекта>"
- "<project name>"
- "<proje adı>"
- "<naziv projekta>"
- "<ім’я проєкту>"
- "<프로젝트 이름>"
locale/gitlab.pot
View file @ 99ed8fec
...@@ -697,6 +697,9 @@ msgstr "" ...@@ -697,6 +697,9 @@ msgstr ""
msgid "%{state} epics" msgid "%{state} epics"
msgstr "" msgstr ""
msgid "%{strongStart}Deletes%{strongEnd} source branch"
msgstr ""
msgid "%{strongStart}Note:%{strongEnd} Once a custom stage has been added you can re-order stages by dragging them into the desired position." msgid "%{strongStart}Note:%{strongEnd} Once a custom stage has been added you can re-order stages by dragging them into the desired position."
msgstr "" msgstr ""
...@@ -1075,9 +1078,6 @@ msgstr "" ...@@ -1075,9 +1078,6 @@ msgstr ""
msgid "< 1 hour" msgid "< 1 hour"
msgstr "" msgstr ""
msgid "<strong>Deletes</strong> source branch"
msgstr ""
msgid "A 'Runner' is a process which runs a job. You can set up as many Runners as you need." msgid "A 'Runner' is a process which runs a job. You can set up as many Runners as you need."
msgstr "" msgstr ""
...@@ -3761,7 +3761,7 @@ msgstr "" ...@@ -3761,7 +3761,7 @@ msgstr ""
msgid "Badges|This project has no badges" msgid "Badges|This project has no badges"
msgstr "" msgstr ""
msgid "Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored." msgid "Badges|You are going to delete this badge. Deleted badges %{strongStart}cannot%{strongEnd} be restored."
msgstr "" msgstr ""
msgid "Badges|Your badges" msgid "Badges|Your badges"
...@@ -5117,9 +5117,6 @@ msgstr "" ...@@ -5117,9 +5117,6 @@ msgstr ""
msgid "ClusterAgent|You have insufficient permissions to create a cluster agent for this project" msgid "ClusterAgent|You have insufficient permissions to create a cluster agent for this project"
msgstr "" msgstr ""
msgid "ClusterIntegration| This will permanently delete the following resources: <ul> <li>All installed applications and related resources</li> <li>The <code>gitlab-managed-apps</code> namespace</li> <li>Any project namespaces</li> <li><code>clusterroles</code></li> <li><code>clusterrolebindings</code></li> </ul>"
msgstr ""
msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster" msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
msgstr "" msgstr ""
...@@ -5174,6 +5171,9 @@ msgstr "" ...@@ -5174,6 +5171,9 @@ msgstr ""
msgid "ClusterIntegration|All data will be deleted and cannot be restored." msgid "ClusterIntegration|All data will be deleted and cannot be restored."
msgstr "" msgstr ""
msgid "ClusterIntegration|All installed applications and related resources"
msgstr ""
msgid "ClusterIntegration|Allow GitLab to manage namespace and service accounts for this cluster." msgid "ClusterIntegration|Allow GitLab to manage namespace and service accounts for this cluster."
msgstr "" msgstr ""
...@@ -5198,6 +5198,9 @@ msgstr "" ...@@ -5198,6 +5198,9 @@ msgstr ""
msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}" msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}"
msgstr "" msgstr ""
msgid "ClusterIntegration|Any project namespaces"
msgstr ""
msgid "ClusterIntegration|Any running pipelines will be canceled." msgid "ClusterIntegration|Any running pipelines will be canceled."
msgstr "" msgstr ""
...@@ -5870,6 +5873,9 @@ msgstr "" ...@@ -5870,6 +5873,9 @@ msgstr ""
msgid "ClusterIntegration|Subnets" msgid "ClusterIntegration|Subnets"
msgstr "" msgstr ""
msgid "ClusterIntegration|The %{gitlabNamespace} namespace"
msgstr ""
msgid "ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provision role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}" msgid "ClusterIntegration|The Amazon Resource Name (ARN) associated with your role. If you do not have a provision role, first create one on %{startAwsLink}Amazon Web Services %{externalLinkIcon}%{endLink} using the above account and external IDs. %{startMoreInfoLink}More information%{endLink}"
msgstr "" msgstr ""
...@@ -5909,15 +5915,27 @@ msgstr "" ...@@ -5909,15 +5915,27 @@ msgstr ""
msgid "ClusterIntegration|This option will allow you to install applications on RBAC clusters." msgid "ClusterIntegration|This option will allow you to install applications on RBAC clusters."
msgstr "" msgstr ""
msgid "ClusterIntegration|This project does not have billing enabled. To create a cluster, %{linkToBillingStart}enable billing%{linkToBillingEnd} and try again."
msgstr ""
msgid "ClusterIntegration|This will permanently delete the following resources:"
msgstr ""
msgid "ClusterIntegration|To access your application after deployment, point a wildcard DNS to the Knative Endpoint." msgid "ClusterIntegration|To access your application after deployment, point a wildcard DNS to the Knative Endpoint."
msgstr "" msgstr ""
msgid "ClusterIntegration|To create a cluster, first create a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}."
msgstr ""
msgid "ClusterIntegration|To remove your integration and resources, type %{clusterName} to confirm:" msgid "ClusterIntegration|To remove your integration and resources, type %{clusterName} to confirm:"
msgstr "" msgstr ""
msgid "ClusterIntegration|To remove your integration, type %{clusterName} to confirm:" msgid "ClusterIntegration|To remove your integration, type %{clusterName} to confirm:"
msgstr "" msgstr ""
msgid "ClusterIntegration|To use a new project, first create one on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}."
msgstr ""
msgid "ClusterIntegration|Uninstall %{appTitle}" msgid "ClusterIntegration|Uninstall %{appTitle}"
msgstr "" msgstr ""
...@@ -5942,6 +5960,9 @@ msgstr "" ...@@ -5942,6 +5960,9 @@ msgstr ""
msgid "ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again." msgid "ClusterIntegration|We could not verify that one of your projects on GCP has billing enabled. Please try again."
msgstr "" msgstr ""
msgid "ClusterIntegration|We were unable to fetch any projects. Ensure that you have a project on %{docsLinkStart}Google Cloud Platform%{docsLinkEnd}."
msgstr ""
msgid "ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." msgid "ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
msgstr "" msgstr ""
...@@ -6373,7 +6394,7 @@ msgstr "" ...@@ -6373,7 +6394,7 @@ msgstr ""
msgid "Configure Tracing" msgid "Configure Tracing"
msgstr "" msgstr ""
msgid "Configure a <code>.gitlab-webide.yml</code> file in the <code>.gitlab</code> directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}" msgid "Configure a %{codeStart}.gitlab-webide.yml%{codeEnd} file in the %{codeStart}.gitlab%{codeEnd} directory to start using the Web Terminal. %{helpStart}Learn more.%{helpEnd}"
msgstr "" msgstr ""
msgid "Configure automatic git checks and housekeeping on repositories." msgid "Configure automatic git checks and housekeeping on repositories."
...@@ -8078,8 +8099,8 @@ msgid_plural "Depends on %d merge requests being merged" ...@@ -8078,8 +8099,8 @@ msgid_plural "Depends on %d merge requests being merged"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
msgid "Depends on <strong>%d closed</strong> merge request." msgid "Depends on %{strongStart}%{closedCount} closed%{strongEnd} merge request."
msgid_plural "Depends on <strong>%d closed</strong> merge requests." msgid_plural "Depends on %{strongStart}%{closedCount} closed%{strongEnd} merge requests."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
...@@ -11653,7 +11674,7 @@ msgstr "" ...@@ -11653,7 +11674,7 @@ msgstr ""
msgid "Go to %{link_to_google_takeout}." msgid "Go to %{link_to_google_takeout}."
msgstr "" msgstr ""
msgid "Go to <strong>Issues</strong> > <strong>Boards</strong> to access your personalized learning issue board." msgid "Go to %{strongStart}Issues%{strongEnd} &gt; %{strongStart}Boards%{strongEnd} to access your personalized learning issue board."
msgstr "" msgstr ""
msgid "Go to Webhooks" msgid "Go to Webhooks"
...@@ -13957,7 +13978,7 @@ msgstr "" ...@@ -13957,7 +13978,7 @@ msgstr ""
msgid "Labels can be applied to issues and merge requests." msgid "Labels can be applied to issues and merge requests."
msgstr "" msgstr ""
msgid "Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>" msgid "Labels|%{spanStart}Promote label%{spanEnd} %{labelTitle} %{spanStart}to Group Label?%{spanEnd}"
msgstr "" msgstr ""
msgid "Labels|Promote Label" msgid "Labels|Promote Label"
...@@ -14525,7 +14546,7 @@ msgstr "" ...@@ -14525,7 +14546,7 @@ msgstr ""
msgid "Lock the discussion" msgid "Lock the discussion"
msgstr "" msgstr ""
msgid "Lock this %{issuableDisplayName}? Only <strong>project members</strong> will be able to comment." msgid "Lock this %{issuableDisplayName}? Only %{strongStart}project members%{strongEnd} will be able to comment."
msgstr "" msgstr ""
msgid "Lock to current projects" msgid "Lock to current projects"
...@@ -19543,9 +19564,6 @@ msgstr "" ...@@ -19543,9 +19564,6 @@ msgstr ""
msgid "PrometheusService|%{exporters} with %{metrics} were found" msgid "PrometheusService|%{exporters} with %{metrics} were found"
msgstr "" msgstr ""
msgid "PrometheusService|<p class=\"text-tertiary\">No <a href=\"%{docsUrl}\">common metrics</a> were found</p>"
msgstr ""
msgid "PrometheusService|Active" msgid "PrometheusService|Active"
msgstr "" msgstr ""
...@@ -19603,6 +19621,9 @@ msgstr "" ...@@ -19603,6 +19621,9 @@ msgstr ""
msgid "PrometheusService|New metric" msgid "PrometheusService|New metric"
msgstr "" msgstr ""
msgid "PrometheusService|No %{docsUrlStart}common metrics%{docsUrlEnd} were found"
msgstr ""
msgid "PrometheusService|No custom metrics have been created. Create one using the button above" msgid "PrometheusService|No custom metrics have been created. Create one using the button above"
msgstr "" msgstr ""
...@@ -25202,9 +25223,6 @@ msgstr "" ...@@ -25202,9 +25223,6 @@ msgstr ""
msgid "This project does not have a wiki homepage yet" msgid "This project does not have a wiki homepage yet"
msgstr "" msgstr ""
msgid "This project does not have billing enabled. To create a cluster, <a href=%{linkToBilling} target=\"_blank\" rel=\"noopener noreferrer\">enable billing <i class=\"fa fa-external-link\" aria-hidden=\"true\"></i></a> and try again."
msgstr ""
msgid "This project has no active access tokens." msgid "This project has no active access tokens."
msgstr "" msgstr ""
...@@ -26238,7 +26256,7 @@ msgstr "" ...@@ -26238,7 +26256,7 @@ msgstr ""
msgid "Unlock the discussion" msgid "Unlock the discussion"
msgstr "" msgstr ""
msgid "Unlock this %{issuableDisplayName}? <strong>Everyone</strong> will be able to comment." msgid "Unlock this %{issuableDisplayName}? %{strongStart}Everyone%{strongEnd} will be able to comment."
msgstr "" msgstr ""
msgid "Unlocked" msgid "Unlocked"
...@@ -27858,10 +27876,10 @@ msgstr "" ...@@ -27858,10 +27876,10 @@ msgstr ""
msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?" msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?"
msgstr "" msgstr ""
msgid "You are going to turn off the confidentiality. This means %{accessLevel} will be able to see and leave a comment on this %{issuableType}." msgid "You are going to turn off the confidentiality. This means %{strongStart}everyone%{strongEnd} will be able to see and leave a comment on this %{issuableType}."
msgstr "" msgstr ""
msgid "You are going to turn on the confidentiality. This means that only team members with %{accessLevel} are able to see and leave comments on the %{issuableType}." msgid "You are going to turn on the confidentiality. This means that only team members with %{strongStart}at least Reporter access%{strongEnd} are able to see and leave comments on the %{issuableType}."
msgstr "" msgstr ""
msgid "You are not allowed to push into this branch. Create another branch or open a merge request." msgid "You are not allowed to push into this branch. Create another branch or open a merge request."
...@@ -28589,9 +28607,6 @@ msgstr "" ...@@ -28589,9 +28607,6 @@ msgstr ""
msgid "assign yourself" msgid "assign yourself"
msgstr "" msgstr ""
msgid "at least Reporter access"
msgstr ""
msgid "at risk" msgid "at risk"
msgstr "" msgstr ""
...@@ -28982,9 +28997,6 @@ msgstr "" ...@@ -28982,9 +28997,6 @@ msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command." msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr "" msgstr ""
msgid "everyone"
msgstr ""
msgid "exceeds the limit of %{bytes} bytes" msgid "exceeds the limit of %{bytes} bytes"
msgstr "" msgstr ""
......
spec/frontend/ide/stores/modules/terminal/messages_spec.js
View file @ 99ed8fec
...@@ -15,6 +15,8 @@ describe('IDE store terminal messages', () => { ...@@ -15,6 +15,8 @@ describe('IDE store terminal messages', () => {
sprintf( sprintf(
messages.ERROR_CONFIG, messages.ERROR_CONFIG,
{ {
codeStart: `<code>`,
codeEnd: `</code>`,
helpStart: `<a href="${escape(TEST_HELP_URL)}" target="_blank">`, helpStart: `<a href="${escape(TEST_HELP_URL)}" target="_blank">`,
helpEnd: '</a>', helpEnd: '</a>',
}, },
......
spec/frontend/sidebar/confidential/__snapshots__/edit_form_spec.js.snap 0 → 100644
View file @ 99ed8fec
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Edit Form Dropdown when confidential renders on or off text based on confidentiality 1`] = `
<div
class="dropdown show"
toggleform="function () {}"
updateconfidentialattribute="function () {}"
>
<div
class="dropdown-menu sidebar-item-warning-message"
>
<div>
<p>
<gl-sprintf-stub
message="You are going to turn off the confidentiality. This means %{strongStart}everyone%{strongEnd} will be able to see and leave a comment on this %{issuableType}."
/>
</p>
<edit-form-buttons-stub
confidential="true"
fullpath=""
/>
</div>
</div>
</div>
`;
exports[`Edit Form Dropdown when not confidential renders "You are going to turn on the confidentiality." in the 1`] = `
<div
class="dropdown show"
toggleform="function () {}"
updateconfidentialattribute="function () {}"
>
<div
class="dropdown-menu sidebar-item-warning-message"
>
<div>
<p>
<gl-sprintf-stub
message="You are going to turn on the confidentiality. This means that only team members with %{strongStart}at least Reporter access%{strongEnd} are able to see and leave comments on the %{issuableType}."
/>
</p>
<edit-form-buttons-stub
fullpath=""
/>
</div>
</div>
</div>
`;
spec/frontend/sidebar/confidential/edit_form_spec.js
View file @ 99ed8fec
...@@ -23,14 +23,14 @@ describe('Edit Form Dropdown', () => { ...@@ -23,14 +23,14 @@ describe('Edit Form Dropdown', () => {
}); });
describe('when not confidential', () => { describe('when not confidential', () => {
it('renders "You are going to turn off the confidentiality." in the ', () => { it('renders "You are going to turn on the confidentiality." in the ', () => {
createComponent({ createComponent({
confidential: false, confidential: false,
toggleForm, toggleForm,
updateConfidentialAttribute, updateConfidentialAttribute,
}); });
expect(wrapper.find('p').text()).toContain('You are going to turn on the confidentiality.'); expect(wrapper.element).toMatchSnapshot();
}); });
}); });
...@@ -42,7 +42,7 @@ describe('Edit Form Dropdown', () => { ...@@ -42,7 +42,7 @@ describe('Edit Form Dropdown', () => {
updateConfidentialAttribute, updateConfidentialAttribute,
}); });
expect(wrapper.find('p').text()).toContain('You are going to turn off the confidentiality.'); expect(wrapper.element).toMatchSnapshot();
}); });
}); });
}); });
spec/frontend/sidebar/lock/__snapshots__/edit_form_spec.js.snap 0 → 100644
View file @ 99ed8fec
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Edit Form Dropdown In issue page when locked the appropriate warning text is rendered 1`] = `
<div
class="dropdown-menu sidebar-item-warning-message"
data-testid="warning-text"
>
<p
class="text"
>
<gl-sprintf-stub
message="Unlock this %{issuableDisplayName}? %{strongStart}Everyone%{strongEnd} will be able to comment."
/>
</p>
<edit-form-buttons-stub
islocked="true"
issuabledisplayname="issue"
/>
</div>
`;
exports[`Edit Form Dropdown In issue page when unlocked the appropriate warning text is rendered 1`] = `
<div
class="dropdown-menu sidebar-item-warning-message"
data-testid="warning-text"
>
<p
class="text"
>
<gl-sprintf-stub
message="Lock this %{issuableDisplayName}? Only %{strongStart}project members%{strongEnd} will be able to comment."
/>
</p>
<edit-form-buttons-stub
issuabledisplayname="issue"
/>
</div>
`;
exports[`Edit Form Dropdown In merge request page when locked the appropriate warning text is rendered 1`] = `
<div
class="dropdown-menu sidebar-item-warning-message"
data-testid="warning-text"
>
<p
class="text"
>
<gl-sprintf-stub
message="Unlock this %{issuableDisplayName}? %{strongStart}Everyone%{strongEnd} will be able to comment."
/>
</p>
<edit-form-buttons-stub
islocked="true"
issuabledisplayname="merge request"
/>
</div>
`;
exports[`Edit Form Dropdown In merge request page when unlocked the appropriate warning text is rendered 1`] = `
<div
class="dropdown-menu sidebar-item-warning-message"
data-testid="warning-text"
>
<p
class="text"
>
<gl-sprintf-stub
message="Lock this %{issuableDisplayName}? Only %{strongStart}project members%{strongEnd} will be able to comment."
/>
</p>
<edit-form-buttons-stub
issuabledisplayname="merge request"
/>
</div>
`;
spec/frontend/sidebar/lock/edit_form_spec.js
View file @ 99ed8fec
...@@ -38,18 +38,16 @@ describe('Edit Form Dropdown', () => { ...@@ -38,18 +38,16 @@ describe('Edit Form Dropdown', () => {
}); });
describe.each` describe.each`
isLocked | lockStatusText | lockAction | warningText isLocked | lockStatusText
${false} | ${'unlocked'} | ${'Lock'} | ${'Only project members will be able to comment.'} ${false} | ${'unlocked'}
${true} | ${'locked'} | ${'Unlock'} | ${'Everyone will be able to comment.'} ${true} | ${'locked'}
`('when $lockStatusText', ({ isLocked, lockAction, warningText }) => { `('when $lockStatusText', ({ isLocked }) => {
beforeEach(() => { beforeEach(() => {
createComponent({ props: { isLocked } }); createComponent({ props: { isLocked } });
}); });
it(`the appropriate warning text is rendered`, () => { it(`the appropriate warning text is rendered`, () => {
expect(findWarningText().text()).toContain( expect(findWarningText().element).toMatchSnapshot();
`${lockAction} this ${issuableDisplayName}? ${warningText}`,
);
}); });
}); });
}); });
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7