From 54b619dfec7255cec44dd2d23add1bbc9062ffee Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 19 Aug 2020 13:06:46 +0300 Subject: [PATCH] show tag name in title for tag timelines --- src/components/timeline_menu/timeline_menu.js | 16 +++++++++++----- src/components/timeline_menu/timeline_menu.vue | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js index c0d75c545d..2be75b06f1 100644 --- a/src/components/timeline_menu/timeline_menu.js +++ b/src/components/timeline_menu/timeline_menu.js @@ -9,7 +9,8 @@ export const timelineNames = () => { 'bookmarks': 'nav.bookmarks', 'dms': 'nav.dms', 'public-timeline': 'nav.public_tl', - 'public-external-timeline': 'nav.twkn' + 'public-external-timeline': 'nav.twkn', + 'tag-timeline': 'tag' } } @@ -40,6 +41,14 @@ const TimelineMenu = { setTimeout(() => { this.isOpen = true }, 25) + }, + timelineName () { + const route = this.$route.name + if (route === 'tag-timeline') { + return '#' + this.$route.params.tag + } + const i18nkey = timelineNames()[this.$route.name] + return i18nkey ? this.$t(i18nkey) : route } }, computed: { @@ -47,10 +56,7 @@ const TimelineMenu = { currentUser: state => state.users.currentUser, privateMode: state => state.instance.private, federating: state => state.instance.federating - }), - timelineNames () { - return timelineNames() - } + }) } } diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue index add8a6eb85..be512d605e 100644 --- a/src/components/timeline_menu/timeline_menu.vue +++ b/src/components/timeline_menu/timeline_menu.vue @@ -45,7 +45,7 @@ slot="trigger" class="title timeline-menu-title" > - {{ $t(timelineNames[$route.name]) }} + {{ timelineName() }}