diff options
Diffstat (limited to 'app/assets/javascripts/set_status_modal')
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_form.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_form.vue b/app/assets/javascripts/set_status_modal/set_status_form.vue index 7f9a30b7ff1..86049a2b781 100644 --- a/app/assets/javascripts/set_status_modal/set_status_form.vue +++ b/app/assets/javascripts/set_status_modal/set_status_form.vue @@ -131,9 +131,9 @@ export default { i18n: { statusMessagePlaceholder: s__(`SetStatusModal|What's your status?`), clearStatusButtonLabel: s__('SetStatusModal|Clear status'), - availabilityCheckboxLabel: s__('SetStatusModal|Busy'), + availabilityCheckboxLabel: s__('SetStatusModal|Set yourself as busy'), availabilityCheckboxHelpText: s__( - 'SetStatusModal|An indicator appears next to your name and avatar', + 'SetStatusModal|Displays that you are busy or not able to respond', ), clearStatusAfterDropdownLabel: s__('SetStatusModal|Clear status after'), clearStatusAfterMessage: s__('SetStatusModal|Your status resets on %{date}.'), @@ -161,11 +161,7 @@ export default { @click="handleEmojiClick" > <template #button-content> - <span - v-if="noEmoji" - class="no-emoji-placeholder position-relative" - data-testid="no-emoji-placeholder" - > + <span v-if="noEmoji" class="gl-relative" data-testid="no-emoji-placeholder"> <gl-icon name="slight-smile" class="award-control-icon-neutral" /> <gl-icon name="smiley" class="award-control-icon-positive" /> <gl-icon name="smile" class="award-control-icon-super-positive" /> diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index 80b1cb8c4d5..80158c55dbc 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -1,7 +1,7 @@ <script> import { GlToast, GlTooltipDirective, GlSafeHtmlDirective, GlModal } from '@gitlab/ui'; import Vue from 'vue'; -import createFlash from '~/flash'; +import { createAlert } from '~/flash'; import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import { s__ } from '~/locale'; import { updateUserStatus } from '~/rest_api'; @@ -89,7 +89,7 @@ export default { window.location.reload(); }, onUpdateFail() { - createFlash({ + createAlert({ message: s__( "SetStatusModal|Sorry, we weren't able to set your status. Please try again later.", ), |