From acd64f58e382dfa3db51dfabd61e4dae48d7b87b Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 31 Jan 2020 11:35:18 +0900 Subject: [PATCH] Resolve #2230 --- src/client/components/notification.vue | 7 +++++-- src/client/components/user-list.vue | 6 +++--- src/client/components/user-preview.vue | 6 +++--- src/client/pages/user/follow-list.vue | 6 +++--- src/client/pages/user/index.vue | 6 +++--- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index e325f0adb..6a9129e38 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -37,7 +37,7 @@ - {{ $t('youGotNewFollower') }} + {{ $t('youGotNewFollower') }}
{{ $t('followRequestAccepted') }} {{ $t('receiveFollowRequest') }}
|
@@ -50,10 +50,13 @@ import { faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck } import { faClock } from '@fortawesome/free-regular-svg-icons'; import getNoteSummary from '../../misc/get-note-summary'; import XReactionIcon from './reaction-icon.vue'; +import MkFollowButton from './follow-button.vue'; +import i18n from '../i18n'; export default Vue.extend({ + i18n, components: { - XReactionIcon + XReactionIcon, MkFollowButton }, props: { notification: { diff --git a/src/client/components/user-list.vue b/src/client/components/user-list.vue index 14a96f3c6..a0c16266e 100644 --- a/src/client/components/user-list.vue +++ b/src/client/components/user-list.vue @@ -20,7 +20,7 @@ {{ $t('noAccountDescription') }} - + - + @@ -113,7 +113,7 @@ import * as age from 's-age'; import XUserTimeline from './index.timeline.vue'; import XUserMenu from '../../components/user-menu.vue'; import XNote from '../../components/note.vue'; -import XFollowButton from '../../components/follow-button.vue'; +import MkFollowButton from '../../components/follow-button.vue'; import MkContainer from '../../components/ui/container.vue'; import Progress from '../../scripts/loading'; import parseAcct from '../../../misc/acct/parse'; @@ -122,7 +122,7 @@ export default Vue.extend({ components: { XUserTimeline, XNote, - XFollowButton, + MkFollowButton, MkContainer, XPhotos: () => import('./index.photos.vue').then(m => m.default), XActivity: () => import('./index.activity.vue').then(m => m.default),