pleroma-fe

commit: c3fa2c90e2e09619ddc72d2c19ea223d49c9d349
parent: 254b0afab747ad6e67b675bdf233b9dfcbc59f0b
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu, 21 Feb 2019 17:24:39 +0000

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
Diffstat:
M
src/components/timeline/timeline.js
3
++-
M
src/components/timeline/timeline.vue
5
++++-
M
src/components/user_profile/user_profile.vue
1
+
M
src/i18n/en.json
3
++-

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
@@ -11,7 +11,8 @@ const Timeline = {
     'title',
     'userId',
     'tag',
-    'embedded'
+    'embedded',
+    'count'
   ],
   data () {
     return {
diff --git 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()'>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
@@ -10,6 +10,7 @@
       <Timeline
         :label="$t('user_card.statuses')"
         :disabled="!user.statuses_count"
+        :count="user.statuses_count"
         :embedded="true"
         :title="$t('user_profile.timeline_title')"
         :timeline="timeline"
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -342,7 +342,8 @@
     "repeated": "repeated",
     "show_new": "Show new",
     "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses"
+    "no_more_statuses": "No more statuses",
+    "no_statuses": "No statuses"
   },
   "user_card": {
     "approve": "Approve",