Merge branch 'issue-376-no-statuses' into 'develop'
#376: update status timeline when it's empty Closes #376 See merge request pleroma/pleroma-fe!601
This commit is contained in:
commit
c3fa2c90e2
4 changed files with 9 additions and 3 deletions
|
@ -11,7 +11,8 @@ const Timeline = {
|
||||||
'title',
|
'title',
|
||||||
'userId',
|
'userId',
|
||||||
'tag',
|
'tag',
|
||||||
'embedded'
|
'embedded',
|
||||||
|
'count'
|
||||||
],
|
],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -20,7 +20,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div :class="classes.footer">
|
<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')}}
|
{{$t('timeline.no_more_statuses')}}
|
||||||
</div>
|
</div>
|
||||||
<a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'>
|
<a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'>
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
<Timeline
|
<Timeline
|
||||||
:label="$t('user_card.statuses')"
|
:label="$t('user_card.statuses')"
|
||||||
:disabled="!user.statuses_count"
|
:disabled="!user.statuses_count"
|
||||||
|
:count="user.statuses_count"
|
||||||
:embedded="true"
|
:embedded="true"
|
||||||
:title="$t('user_profile.timeline_title')"
|
:title="$t('user_profile.timeline_title')"
|
||||||
:timeline="timeline"
|
:timeline="timeline"
|
||||||
|
|
|
@ -342,7 +342,8 @@
|
||||||
"repeated": "repeated",
|
"repeated": "repeated",
|
||||||
"show_new": "Show new",
|
"show_new": "Show new",
|
||||||
"up_to_date": "Up-to-date",
|
"up_to_date": "Up-to-date",
|
||||||
"no_more_statuses": "No more statuses"
|
"no_more_statuses": "No more statuses",
|
||||||
|
"no_statuses": "No statuses"
|
||||||
},
|
},
|
||||||
"user_card": {
|
"user_card": {
|
||||||
"approve": "Approve",
|
"approve": "Approve",
|
||||||
|
|
Loading…
Reference in a new issue