Commit 7976d118 authored by HJ's avatar HJ 🐼

Cleanup, little documentation, localization

parent 543604fd
Pipeline #11856 failed with stages
in 54 seconds
...@@ -34,7 +34,7 @@ export default (store) => { ...@@ -34,7 +34,7 @@ export default (store) => {
{ name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline }, { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
{ name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
{ name: 'external-user-profile', path: '/users/:id', component: UserProfile }, { name: 'external-user-profile', path: '/users/:id', component: UserProfile },
{ name: 'mentions', path: '/users/:username/interactions', component: Interactions }, { name: 'interactions', path: '/users/:username/interactions', component: Interactions },
{ name: 'dms', path: '/users/:username/dms', component: DMs }, { name: 'dms', path: '/users/:username/dms', component: DMs },
{ name: 'settings', path: '/settings', component: Settings }, { name: 'settings', path: '/settings', component: Settings },
{ name: 'registration', path: '/registration', component: Registration }, { name: 'registration', path: '/registration', component: Registration },
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
ref="tabSwitcher" ref="tabSwitcher"
:onSwitch="onModeSwitch" :onSwitch="onModeSwitch"
> >
<span data-tab-dummy data-filter="mentions" :label="$t('MENTIONS')"/> <span data-tab-dummy data-filter="mentions" :label="$t('nav.mentions')"/>
<span data-tab-dummy data-filter="likes+repeats" :label="$t('LIKES AND REPEATS')"/> <span data-tab-dummy data-filter="likes+repeats" :label="$t('interactions.favs_repeats')"/>
<span data-tab-dummy data-filter="follows" :label="$t('FOLLOWS')"/> <span data-tab-dummy data-filter="follows" :label="$t('interactions.follows')"/>
</tab-switcher> </tab-switcher>
<Notifications <Notifications
ref="notifications" ref="notifications"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</router-link> </router-link>
</li> </li>
<li v-if='currentUser'> <li v-if='currentUser'>
<router-link :to="{ name: 'mentions', params: { username: currentUser.screen_name } }"> <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
{{ $t("nav.interactions") }} {{ $t("nav.interactions") }}
</router-link> </router-link>
</li> </li>
......
...@@ -7,9 +7,15 @@ import { ...@@ -7,9 +7,15 @@ import {
} from '../../services/notification_utils/notification_utils.js' } from '../../services/notification_utils/notification_utils.js'
const Notifications = { const Notifications = {
props: [ props: {
'noHeading', 'minimalMode', 'filterMode' // Disables display of panel header
], noHeading: Boolean,
// Disables panel styles, unread mark, potentially other notification-related actions
// meant for "Interactions" timeline
minimalMode: Boolean,
// Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline
filterMode: Array
},
data () { data () {
return { return {
bottomedOut: false bottomedOut: false
......
@import '../../_variables.scss'; @import '../../_variables.scss';
.notifications { .notifications {
// a bit of a hack to allow scrolling below notifications &:not(.minimal) {
padding-bottom: 15em; // a bit of a hack to allow scrolling below notifications
padding-bottom: 15em;
}
.loadmore-error { .loadmore-error {
color: $fallback--text; color: $fallback--text;
......
<template> <template>
<div class="notifications"> <div :class="{ minimal: minimalMode }" class="notifications">
<div :class="mainClass"> <div :class="mainClass">
<div v-if="!noHeading" class="panel-heading"> <div v-if="!noHeading" class="panel-heading">
<div class="title"> <div class="title">
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
{{$t('notifications.no_more_notifications')}} {{$t('notifications.no_more_notifications')}}
</div> </div>
<a v-else-if="!loading" href="#" v-on:click.prevent="fetchOlderNotifications()"> <a v-else-if="!loading" href="#" v-on:click.prevent="fetchOlderNotifications()">
<div class="new-status-notification text-center panel-footer">{{$t('notifications.load_older')}}</div> <div class="new-status-notification text-center panel-footer">
{{ minimalMode ? $t('interactions.load_older') : $t('notifications.load_older')}}
</div>
</a> </a>
<div v-else class="new-status-notification text-center panel-footer"> <div v-else class="new-status-notification text-center panel-footer">
<i class="icon-spin3 animate-spin"/> <i class="icon-spin3 animate-spin"/>
......
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
{{ $t("nav.dms") }} {{ $t("nav.dms") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser" @click="toggleDrawer">
<router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
{{ $t("nav.interactions") }}
</router-link>
</li>
</ul> </ul>
<ul> <ul>
<li v-if="currentUser" @click="toggleDrawer"> <li v-if="currentUser" @click="toggleDrawer">
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
"chat": "Local Chat", "chat": "Local Chat",
"friend_requests": "Follow Requests", "friend_requests": "Follow Requests",
"mentions": "Mentions", "mentions": "Mentions",
"interactions": "Interactions",
"dms": "Direct Messages", "dms": "Direct Messages",
"public_tl": "Public Timeline", "public_tl": "Public Timeline",
"timeline": "Timeline", "timeline": "Timeline",
...@@ -78,6 +79,11 @@ ...@@ -78,6 +79,11 @@
"repeated_you": "repeated your status", "repeated_you": "repeated your status",
"no_more_notifications": "No more notifications" "no_more_notifications": "No more notifications"
}, },
"interactions": {
"favs_repeats": "Repeats and Favorites",
"follows": "New follows",
"load_older": "Load older interactions"
},
"post_status": { "post_status": {
"new_status": "Post new status", "new_status": "Post new status",
"account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.", "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"back": "Назад", "back": "Назад",
"chat": "Локальный чат", "chat": "Локальный чат",
"mentions": "Упоминания", "mentions": "Упоминания",
"interactions": "Взаимодействия",
"public_tl": "Публичная лента", "public_tl": "Публичная лента",
"timeline": "Лента", "timeline": "Лента",
"twkn": "Федеративная лента" "twkn": "Федеративная лента"
...@@ -36,6 +37,11 @@ ...@@ -36,6 +37,11 @@
"read": "Прочесть", "read": "Прочесть",
"repeated_you": "повторил(а) ваш статус" "repeated_you": "повторил(а) ваш статус"
}, },
"interactions": {
"favs_repeats": "Повторы и фавориты",
"follows": "Новые подписки",
"load_older": "Загрузить старые взаимодействия"
},
"post_status": { "post_status": {
"account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков", "account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
"account_not_locked_warning_link": "залочен", "account_not_locked_warning_link": "залочен",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment