diff options
| author | shpuld <shp@cock.li> | 2017-11-08 11:27:22 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2017-11-08 11:27:22 +0200 |
| commit | 176421163b85ce2e5d63d82c914c245a15234132 (patch) | |
| tree | 10d103e9e8851e8301137e3928391be02309d4ae /src/components/timeline/timeline.vue | |
| parent | bfa04bfb11909c9e4af108973b5f34eaae6b9472 (diff) | |
| parent | 5dca57cc058bfb95e40e32714057cbf0d24ce679 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index f36770d6..01f330c2 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -5,20 +5,20 @@ {{title}} </div> <button @click.prevent="showNewStatuses" class="base05 base01-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> - Show new ({{timeline.newStatusCount}}) + {{$t('timeline.show_new')}} ({{timeline.newStatusCount}}) </button> <div @click.prevent class="base06 error loadmore-text" v-if="timelineError"> - Error fetching updates + {{$t('timeline.error_fetching')}} </div> <div @click.prevent class="base04 base01-background loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError"> - Up-to-date + {{$t('timeline.up_to_date')}} </div> </div> <div class="panel-body"> <div class="timeline"> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> - <div class="base01-background base03-border new-status-notification text-center">Load older statuses.</div> + <div class="base01-background base03-border new-status-notification text-center">{{$t('timeline.load_older')}}</div> </a> <div class="base01-background base03-border new-status-notification text-center" v-else>...</div> </div> @@ -27,7 +27,7 @@ <div class="timeline panel panel-default" v-else-if="viewing == 'followers'"> <div class="panel-heading timeline-heading base01-background base04"> <div class="title"> - Followers + {{$t('user_card.followers')}} </div> </div> <div class="panel-body"> @@ -39,7 +39,7 @@ <div class="timeline panel panel-default" v-else-if="viewing == 'friends'"> <div class="panel-heading timeline-heading base01-background base04"> <div class="title"> - Following + {{$t('user_card.followees')}} </div> </div> <div class="panel-body"> |