Fix bug
This commit is contained in:
		@@ -32,7 +32,7 @@
 | 
			
		||||
		<div class="files" v-if="files.length > 0">
 | 
			
		||||
			<x-file v-for="file in files" :key="file.id" :file="file"/>
 | 
			
		||||
			<button class="more" v-if="moreFiles" @click="fetchMoreFiles">
 | 
			
		||||
				{{ fetchingMoreFiles ? '%i18n:common.loading%' : '%i18n:@load-more%' }}
 | 
			
		||||
				{{ fetchingMoreFiles ? '%i18n:!common.loading%' : '%i18n:!@load-more%' }}
 | 
			
		||||
			</button>
 | 
			
		||||
		</div>
 | 
			
		||||
		<div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching">
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
	<template v-if="!wait && user.isFollowing">%fa:minus%</template>
 | 
			
		||||
	<template v-if="!wait && !user.isFollowing">%fa:plus%</template>
 | 
			
		||||
	<template v-if="wait">%fa:spinner .pulse .fw%</template>
 | 
			
		||||
	{{ user.isFollowing ? '%i18n:@unfollow%' : '%i18n:@follow%' }}
 | 
			
		||||
	{{ user.isFollowing ? '%i18n:!@unfollow%' : '%i18n:!@follow%' }}
 | 
			
		||||
</button>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,9 +9,9 @@
 | 
			
		||||
				<img class="avatar" :src="`${note.user.avatarUrl}?thumbnail&size=64`" alt="avatar"/>
 | 
			
		||||
			</router-link>
 | 
			
		||||
			%fa:retweet%
 | 
			
		||||
			<span>{{ '%i18n:@reposted-by%'.substr(0, '%i18n:@reposted-by%'.indexOf('{')) }}</span>
 | 
			
		||||
			<span>{{ '%i18n:!@reposted-by%'.substr(0, '%i18n:!@reposted-by%'.indexOf('{')) }}</span>
 | 
			
		||||
			<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</router-link>
 | 
			
		||||
			<span>{{ '%i18n:@reposted-by%'.substr('%i18n:@reposted-by%'.indexOf('}') + 1) }}</span>
 | 
			
		||||
			<span>{{ '%i18n:!@reposted-by%'.substr('%i18n:!@reposted-by%'.indexOf('}') + 1) }}</span>
 | 
			
		||||
		</p>
 | 
			
		||||
		<mk-time :time="note.createdAt"/>
 | 
			
		||||
	</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@
 | 
			
		||||
	</div>
 | 
			
		||||
	<button class="more" v-if="moreNotifications" @click="fetchMoreNotifications" :disabled="fetchingMoreNotifications">
 | 
			
		||||
		<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>
 | 
			
		||||
		{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
 | 
			
		||||
		{{ fetchingMoreNotifications ? '%i18n:!common.loading%' : '%i18n:!@more%' }}
 | 
			
		||||
	</button>
 | 
			
		||||
	<p class="empty" v-if="notifications.length == 0 && !fetching">%i18n:@empty%</p>
 | 
			
		||||
	<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
 | 
			
		||||
 
 | 
			
		||||
@@ -5,12 +5,12 @@
 | 
			
		||||
		<div>
 | 
			
		||||
			<span class="text-count" :class="{ over: text.length > 1000 }">{{ 1000 - text.length }}</span>
 | 
			
		||||
			<span class="geo" v-if="geo">%fa:map-marker-alt%</span>
 | 
			
		||||
			<button class="submit" :disabled="posting" @click="post">{{ reply ? '返信' : '%i18n:@submit%' }}</button>
 | 
			
		||||
			<button class="submit" :disabled="posting" @click="post">{{ reply ? '返信' : '%i18n:!@submit%' }}</button>
 | 
			
		||||
		</div>
 | 
			
		||||
	</header>
 | 
			
		||||
	<div class="form">
 | 
			
		||||
		<mk-note-preview v-if="reply" :note="reply"/>
 | 
			
		||||
		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="reply ? '%i18n:@reply-placeholder%' : '%i18n:@note-placeholder%'"></textarea>
 | 
			
		||||
		<textarea v-model="text" ref="text" :disabled="posting" :placeholder="reply ? '%i18n:!@reply-placeholder%' : '%i18n:!@note-placeholder%'"></textarea>
 | 
			
		||||
		<div class="attaches" v-show="files.length != 0">
 | 
			
		||||
			<x-draggable class="files" :list="files" :options="{ animation: 150 }">
 | 
			
		||||
				<div class="file" v-for="file in files" :key="file.id">
 | 
			
		||||
 
 | 
			
		||||
@@ -92,7 +92,7 @@ export default Vue.extend({
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
		search() {
 | 
			
		||||
			const query = window.prompt('%i18n:@search%');
 | 
			
		||||
			const query = window.prompt('%i18n:!@search%');
 | 
			
		||||
			if (query == null || query == '') return;
 | 
			
		||||
			this.$router.push('/search?q=' + encodeURIComponent(query));
 | 
			
		||||
		},
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@
 | 
			
		||||
		</div>
 | 
			
		||||
		<div class="empty" v-if="!fetching && notes.length == 0">
 | 
			
		||||
			%fa:R comments%
 | 
			
		||||
			{{ withMedia ? '%i18n:@no-notes-with-media%' : '%i18n:@no-notes%' }}
 | 
			
		||||
			{{ withMedia ? '%i18n:!@no-notes-with-media%' : '%i18n:!@no-notes%' }}
 | 
			
		||||
		</div>
 | 
			
		||||
		<button v-if="!fetching && existMore" @click="more" :disabled="moreFetching" slot="tail">
 | 
			
		||||
			<span v-if="!moreFetching">%i18n:@load-more%</span>
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
<mk-ui>
 | 
			
		||||
	<template slot="header" v-if="!fetching">
 | 
			
		||||
		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">
 | 
			
		||||
		{{ '%i18n:@followers-of%'.replace('{}', name) }}
 | 
			
		||||
		{{ '%i18n:!@followers-of%'.replace('{}', name) }}
 | 
			
		||||
	</template>
 | 
			
		||||
	<mk-users-list
 | 
			
		||||
		v-if="!fetching"
 | 
			
		||||
@@ -52,7 +52,7 @@ export default Vue.extend({
 | 
			
		||||
				this.user = user;
 | 
			
		||||
				this.fetching = false;
 | 
			
		||||
 | 
			
		||||
				document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | Misskey';
 | 
			
		||||
				document.title = '%i18n:!@followers-of%'.replace('{}', this.name) + ' | Misskey';
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
		onLoaded() {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
<mk-ui>
 | 
			
		||||
	<template slot="header" v-if="!fetching">
 | 
			
		||||
		<img :src="`${user.avatarUrl}?thumbnail&size=64`" alt="">
 | 
			
		||||
		{{ '%i18n:@following-of%'.replace('{}', name) }}
 | 
			
		||||
		{{ '%i18n:!@following-of%'.replace('{}', name) }}
 | 
			
		||||
	</template>
 | 
			
		||||
	<mk-users-list
 | 
			
		||||
		v-if="!fetching"
 | 
			
		||||
@@ -51,7 +51,7 @@ export default Vue.extend({
 | 
			
		||||
				this.user = user;
 | 
			
		||||
				this.fetching = false;
 | 
			
		||||
 | 
			
		||||
				document.title = '%i18n:@followers-of%'.replace('{}', this.name) + ' | Misskey';
 | 
			
		||||
				document.title = '%i18n:!@followers-of%'.replace('{}', this.name) + ' | Misskey';
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
		onLoaded() {
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ export default Vue.extend({
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
		fn() {
 | 
			
		||||
			const ok = window.confirm('%i18n:@read-all%');
 | 
			
		||||
			const ok = window.confirm('%i18n:!@read-all%');
 | 
			
		||||
			if (!ok) return;
 | 
			
		||||
 | 
			
		||||
			(this as any).api('notifications/markAsRead_all');
 | 
			
		||||
 
 | 
			
		||||
@@ -72,7 +72,7 @@ export default Vue.extend({
 | 
			
		||||
					avatarId: file.id
 | 
			
		||||
				}).then(() => {
 | 
			
		||||
					this.avatarSaving = false;
 | 
			
		||||
					alert('%i18n:@avatar-saved%');
 | 
			
		||||
					alert('%i18n:!@avatar-saved%');
 | 
			
		||||
				});
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
@@ -86,7 +86,7 @@ export default Vue.extend({
 | 
			
		||||
					bannerId: file.id
 | 
			
		||||
				}).then(() => {
 | 
			
		||||
					this.bannerSaving = false;
 | 
			
		||||
					alert('%i18n:@banner-saved%');
 | 
			
		||||
					alert('%i18n:!@banner-saved%');
 | 
			
		||||
				});
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
@@ -100,7 +100,7 @@ export default Vue.extend({
 | 
			
		||||
				birthday: this.birthday || null
 | 
			
		||||
			}).then(() => {
 | 
			
		||||
				this.saving = false;
 | 
			
		||||
				alert('%i18n:@saved%');
 | 
			
		||||
				alert('%i18n:!@saved%');
 | 
			
		||||
			});
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
	<span slot="header">%fa:search% {{ q }}</span>
 | 
			
		||||
	<main v-if="!fetching">
 | 
			
		||||
		<mk-notes :class="$style.notes" :notes="notes">
 | 
			
		||||
			<span v-if="notes.length == 0">{{ '%i18n:@empty%'.replace('{}', q) }}</span>
 | 
			
		||||
			<span v-if="notes.length == 0">{{ '%i18n:!@empty%'.replace('{}', q) }}</span>
 | 
			
		||||
			<button v-if="existMore" @click="more" :disabled="fetching" slot="tail">
 | 
			
		||||
				<span v-if="!fetching">%i18n:@load-more%</span>
 | 
			
		||||
				<span v-if="fetching">%i18n:common.loading%<mk-ellipsis/></span>
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ export default Vue.extend({
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
	mounted() {
 | 
			
		||||
		document.title = '%i18n:@title%';
 | 
			
		||||
		document.title = '%i18n:!@title%';
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
		onSelected(file) {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
<mk-ui>
 | 
			
		||||
	<span slot="header">%fa:cog%%i18n:@settings%</span>
 | 
			
		||||
	<div :class="$style.content">
 | 
			
		||||
		<p v-html="'%i18n:@signed-in-as%'.replace('{}', '<b>' + name + '</b>')"></p>
 | 
			
		||||
		<p v-html="'%i18n:!@signed-in-as%'.replace('{}', '<b>' + name + '</b>')"></p>
 | 
			
		||||
		<ul>
 | 
			
		||||
			<li><router-link to="./settings/profile">%fa:user%%i18n:@profile%%fa:angle-right%</router-link></li>
 | 
			
		||||
			<li><router-link to="./settings/twitter">%fa:B twitter%%i18n:@twitter%%fa:angle-right%</router-link></li>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user