diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/badges | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/badges')
-rw-r--r-- | app/assets/javascripts/badges/components/badge_form.vue | 18 | ||||
-rw-r--r-- | app/assets/javascripts/badges/components/badge_settings.vue | 22 |
2 files changed, 26 insertions, 14 deletions
diff --git a/app/assets/javascripts/badges/components/badge_form.vue b/app/assets/javascripts/badges/components/badge_form.vue index 4145a4a4145..08834df0a9b 100644 --- a/app/assets/javascripts/badges/components/badge_form.vue +++ b/app/assets/javascripts/badges/components/badge_form.vue @@ -2,7 +2,7 @@ import { escape, debounce } from 'lodash'; import { mapActions, mapState } from 'vuex'; import { GlLoadingIcon, GlFormInput, GlFormGroup } from '@gitlab/ui'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__, sprintf } from '~/locale'; import LoadingButton from '~/vue_shared/components/loading_button.vue'; import createEmptyBadge from '../empty_badge'; @@ -184,7 +184,7 @@ export default { @input="debouncedPreview" /> <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div> - <span class="form-text text-muted"> {{ badgeLinkUrlExample }} </span> + <span class="form-text text-muted">{{ badgeLinkUrlExample }}</span> </div> <div class="form-group"> @@ -199,7 +199,7 @@ export default { @input="debouncedPreview" /> <div class="invalid-feedback">{{ s__('Badges|Please fill in a valid URL') }}</div> - <span class="form-text text-muted"> {{ badgeImageUrlExample }} </span> + <span class="form-text text-muted">{{ badgeImageUrlExample }}</span> </div> <div class="form-group"> @@ -210,22 +210,26 @@ export default { :image-url="renderedImageUrl" :link-url="renderedLinkUrl" /> - <p v-show="isRendering"><gl-loading-icon :inline="true" /></p> + <p v-show="isRendering"> + <gl-loading-icon :inline="true" /> + </p> <p v-show="!renderedBadge && !isRendering" class="disabled-content"> {{ s__('Badges|No image to preview') }} </p> </div> - <div v-if="isEditing" class="row-content-block"> + <div v-if="isEditing" class="row-content-block gl-display-flex gl-justify-content-end"> + <button class="btn btn-cancel gl-mr-4" type="button" @click="onCancel"> + {{ __('Cancel') }} + </button> <loading-button :loading="isSaving" :label="s__('Badges|Save changes')" type="submit" container-class="btn btn-success" /> - <button class="btn btn-cancel" type="button" @click="onCancel">{{ __('Cancel') }}</button> </div> - <div v-else class="form-group"> + <div v-else class="gl-display-flex gl-justify-content-end form-group"> <loading-button :loading="isSaving" :label="s__('Badges|Add badge')" diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index 531f84ad272..531742e49e3 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -1,6 +1,7 @@ <script> import { mapState, mapActions } from 'vuex'; -import createFlash from '~/flash'; +import { GlSprintf } from '@gitlab/ui'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import { s__ } from '~/locale'; import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import Badge from './badge.vue'; @@ -14,14 +15,15 @@ export default { BadgeForm, BadgeList, GlModal: DeprecatedModal2, + GlSprintf, + }, + i18n: { + deleteModalText: s__( + 'Badges|You are going to delete this badge. Deleted badges %{strongStart}cannot%{strongEnd} be restored.', + ), }, computed: { ...mapState(['badgeInModal', 'isEditing']), - deleteModalText() { - return s__( - 'Badges|You are going to delete this badge. Deleted badges <strong>cannot</strong> be restored.', - ); - }, }, methods: { ...mapActions(['deleteBadge']), @@ -54,7 +56,13 @@ export default { :link-url="badgeInModal ? badgeInModal.renderedLinkUrl : ''" /> </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> <badge-form v-show="isEditing" :is-editing="true" /> |