diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:30:17 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-24 07:30:17 +0000 |
| commit | 2431d35277b0c7c761bf080f0bfffa654ee4b182 (patch) | |
| tree | b88d02bfb78b4f733e71f975c5da9203468f20da /src/components/timeline/timeline.vue | |
| parent | 38cab5e4b695eea90b01c2866976960e9fc01128 (diff) | |
| parent | 6b773902e8dae36b2c4cf4c970fd1437cfdc13bc (diff) | |
Merge branch 'feature/flush-timeline-with-holes' into 'develop'
Clear timeline when there's holes between old and new
Closes #54
See merge request pleroma/pleroma-fe!171
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 0e2ed92c..9d2e1ea1 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -5,7 +5,7 @@ {{title}} </div> <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> - {{$t('timeline.show_new')}} ({{timeline.newStatusCount}}) + {{$t('timeline.show_new')}}{{newStatusCountStr}} </button> <div @click.prevent class="base06 error loadmore-text" v-if="timelineError"> {{$t('timeline.error_fetching')}} |