diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 57a969c2a..d29d22f4a 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -2,9 +2,9 @@ import { mapState } from 'pinia' import nsfwImage from '../../assets/nsfw.png' import Flash from '../flash/flash.vue' +import Popover from '../popover/popover.vue' import StillImage from '../still-image/still-image.vue' import VideoAttachment from '../video_attachment/video_attachment.vue' -import Popover from '../popover/popover.vue' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index ca5f395a6..1a1b84628 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -87,7 +87,7 @@ trigger="click" popover-class="popover popover-default description-popover" :trigger-attrs="{ 'class': 'button-default attachment-button -transparent', 'title': $t('status.attachment_description') }" - > + > diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 6c4568d14..0cce2494d 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -589,7 +589,7 @@ const EmojiInput = { setCaret({ target: { selectionStart } }) { this.caret = selectionStart this.$nextTick(() => { - this.$refs.suggestorPopover.updateStyles() + this.$refs.suggestorPopover?.updateStyles() }) }, autoCompleteItemLabel(suggestion) { diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue index 0011e70a5..f2f47a0b6 100644 --- a/src/components/media_modal/media_modal.vue +++ b/src/components/media_modal/media_modal.vue @@ -90,8 +90,8 @@ {{ $t('status.attachment_description') }} diff --git a/src/components/status_action_buttons/action_button.vue b/src/components/status_action_buttons/action_button.vue index 82b481127..a76af3809 100644 --- a/src/components/status_action_buttons/action_button.vue +++ b/src/components/status_action_buttons/action_button.vue @@ -26,7 +26,7 @@ /> {{ $t('user_card.followers') }} - - - - {{ $t('user_card.birthday', { birthday: formattedBirthday }) }} - - - - - {{ $t('settings.birthday.show_birthday') }} - - - - {{ $t('settings.birthday.label') }} - + + - - + + + + {{ ' ' }} + + {{ $t('user_card.birthday', { birthday: formattedBirthday }) }} + + + + + + {{ $t('settings.birthday.show_birthday') }} + + + + {{ $t('settings.birthday.label') }} + + + + + + {{ $t('user_card.joined') }} + + {{ ' ' }} + + {{ formattedBirthday }} + + + {{ $t('settings.profile_other') }} diff --git a/src/i18n/en.json b/src/i18n/en.json index 510250f73..95f02507b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1714,6 +1714,7 @@ "bot": "Bot", "group": "Group", "birthday": "Born {birthday}", + "joined": "Joined", "admin_menu": { "moderation": "Moderation", "grant_admin": "Grant Admin", diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 53fe8c127..6ed628e5d 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -1,6 +1,6 @@ import { parseLinkHeader } from '@web3-storage/parse-link-header' import escapeHtml from 'escape-html' -import { unescape } from 'lodash' +import { unescape as lodashUnescape } from 'lodash' import punycode from 'punycode.js' import fileTypeService from '../file_type/file_type.service.js' @@ -308,7 +308,7 @@ export const parseAttachment = (data) => { } output.url = data.url output.large_thumb_url = data.preview_url - output.description = unescape(data.description) + output.description = lodashUnescape(data.description) return output }