aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline/timeline.vue
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-03-07 15:11:11 +0000
committerShpuld Shpludson <shp@cock.li>2019-03-07 15:11:11 +0000
commit7e9c8c3d219aa3b787c5606efbb54a73c1738b07 (patch)
tree1847fa78707d800e28997bd8828327cf5c890838 /src/components/timeline/timeline.vue
parent4800169f36e0a71c322b9707a797c3b1ad48bf58 (diff)
parentc44f0a9bde08c50598207494b121ae4bdf1f0fb1 (diff)
Merge branch 'develop' into 'master'
Update master See merge request pleroma/pleroma-fe!646
Diffstat (limited to 'src/components/timeline/timeline.vue')
-rw-r--r--src/components/timeline/timeline.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index e3eea3bd..8f28d65c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -20,7 +20,10 @@
</div>
</div>
<div :class="classes.footer">
- <div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint">
+ <div v-if="count===0" class="new-status-notification text-center panel-footer faint">
+ {{$t('timeline.no_statuses')}}
+ </div>
+ <div v-else-if="bottomedOut" class="new-status-notification text-center panel-footer faint">
{{$t('timeline.no_more_statuses')}}
</div>
<a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'>