1
0
forked from mirror/misskey

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-02-15 06:06:24 +09:00
commit 8e3d884081
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 10 additions and 2 deletions

View File

@ -863,6 +863,9 @@ desktop/views/components/renote-form.vue:
desktop/views/components/renote-form-window.vue: desktop/views/components/renote-form-window.vue:
title: "この投稿をRenoteしますか" title: "この投稿をRenoteしますか"
desktop/views/components/timeline.core.vue:
empty: "投稿がありません"
desktop/views/pages/user-following-or-followers.vue: desktop/views/pages/user-following-or-followers.vue:
following: "{user}のフォロー" following: "{user}のフォロー"
followers: "{user}のフォロワー" followers: "{user}のフォロワー"
@ -1679,6 +1682,9 @@ mobile/views/pages/home.vue:
mentions: "あなた宛て" mentions: "あなた宛て"
messages: "メッセージ" messages: "メッセージ"
mobile/views/pages/home.timeline.vue:
empty: "投稿がありません"
mobile/views/pages/tag.vue: mobile/views/pages/tag.vue:
no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。" no-posts-found: "ハッシュタグ「{q}」が付けられた投稿は見つかりませんでした。"

View File

@ -4,8 +4,7 @@
<mk-notes ref="timeline" :more="existMore ? more : null"> <mk-notes ref="timeline" :more="existMore ? more : null">
<div slot="empty"> <div slot="empty">
<fa :icon="['far', 'comments']"/> <fa :icon="['far', 'comments']"/>{{ $t('empty') }}
%i18n:@empty%
</div> </div>
</mk-notes> </mk-notes>
</div> </div>
@ -13,10 +12,13 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n';
const fetchLimit = 10; const fetchLimit = 10;
export default Vue.extend({ export default Vue.extend({
i18n: i18n('mobile/views/pages/home.timeline.vue'),
props: { props: {
src: { src: {
type: String, type: String,