No OneTemporary
Actions

Size

65 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
	index 23c1acdb03..8e1cad7aee 100644
	--- a/src/components/settings/settings.js
	+++ b/src/components/settings/settings.js
	@@ -1,193 +1,202 @@
	/* eslint-env browser */
	import TabSwitcher from '../tab_switcher/tab_switcher.js'
	import StyleSwitcher from '../style_switcher/style_switcher.vue'
	import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
	import { filter, trim } from 'lodash'

	const settings = {
	data () {
	const user = this.$store.state.config
	const instance = this.$store.state.instance

	return {
	hideAttachmentsLocal: user.hideAttachments,
	hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
	+ maxThumbnails: user.maxThumbnails,
	hideNsfwLocal: user.hideNsfw,
	useOneClickNsfw: user.useOneClickNsfw,
	hideISPLocal: user.hideISP,
	preloadImage: user.preloadImage,

	hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
	? instance.hidePostStats
	: user.hidePostStats,
	hidePostStatsDefault: this.$t('settings.values.' + instance.hidePostStats),

	hideUserStatsLocal: typeof user.hideUserStats === 'undefined'
	? instance.hideUserStats
	: user.hideUserStats,
	hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),

	hideFilteredStatusesLocal: typeof user.hideFilteredStatuses === 'undefined'
	? instance.hideFilteredStatuses
	: user.hideFilteredStatuses,
	hideFilteredStatusesDefault: this.$t('settings.values.' + instance.hideFilteredStatuses),

	notificationVisibilityLocal: user.notificationVisibility,
	replyVisibilityLocal: user.replyVisibility,
	loopVideoLocal: user.loopVideo,
	muteWordsString: user.muteWords.join('\n'),
	autoLoadLocal: user.autoLoad,
	streamingLocal: user.streaming,
	pauseOnUnfocusedLocal: user.pauseOnUnfocused,
	hoverPreviewLocal: user.hoverPreview,

	collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
	? instance.collapseMessageWithSubject
	: user.collapseMessageWithSubject,
	collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),

	subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined'
	? instance.subjectLineBehavior
	: user.subjectLineBehavior,
	subjectLineBehaviorDefault: instance.subjectLineBehavior,

	postContentTypeLocal: typeof user.postContentType === 'undefined'
	? instance.postContentType
	: user.postContentType,
	postContentTypeDefault: instance.postContentType,

	alwaysShowSubjectInputLocal: typeof user.alwaysShowSubjectInput === 'undefined'
	? instance.alwaysShowSubjectInput
	: user.alwaysShowSubjectInput,
	alwaysShowSubjectInputDefault: instance.alwaysShowSubjectInput,

	scopeCopyLocal: typeof user.scopeCopy === 'undefined'
	? instance.scopeCopy
	: user.scopeCopy,
	scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy),

	stopGifs: user.stopGifs,
	webPushNotificationsLocal: user.webPushNotifications,
	loopVideoSilentOnlyLocal: user.loopVideosSilentOnly,
	loopSilentAvailable:
	// Firefox
	Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') \|\|
	// Chrome-likes
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') \|\|
	// Future spec, still not supported in Nightly 63 as of 08/2018
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
	playVideosInModal: user.playVideosInModal,
	useContainFit: user.useContainFit
	}
	},
	components: {
	TabSwitcher,
	StyleSwitcher,
	InterfaceLanguageSwitcher
	},
	computed: {
	user () {
	return this.$store.state.users.currentUser
	},
	currentSaveStateNotice () {
	return this.$store.state.interface.settings.currentSaveStateNotice
	},
	instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
	},
	watch: {
	hideAttachmentsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachments', value })
	},
	hideAttachmentsInConvLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
	},
	hidePostStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hidePostStats', value })
	},
	hideUserStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideUserStats', value })
	},
	hideFilteredStatusesLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
	},
	hideNsfwLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideNsfw', value })
	},
	useOneClickNsfw (value) {
	this.$store.dispatch('setOption', { name: 'useOneClickNsfw', value })
	},
	preloadImage (value) {
	this.$store.dispatch('setOption', { name: 'preloadImage', value })
	},
	hideISPLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideISP', value })
	},
	'notificationVisibilityLocal.likes' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.follows' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.repeats' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.mentions' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	replyVisibilityLocal (value) {
	this.$store.dispatch('setOption', { name: 'replyVisibility', value })
	},
	loopVideoLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideo', value })
	},
	loopVideoSilentOnlyLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideoSilentOnly', value })
	},
	autoLoadLocal (value) {
	this.$store.dispatch('setOption', { name: 'autoLoad', value })
	},
	streamingLocal (value) {
	this.$store.dispatch('setOption', { name: 'streaming', value })
	},
	pauseOnUnfocusedLocal (value) {
	this.$store.dispatch('setOption', { name: 'pauseOnUnfocused', value })
	},
	hoverPreviewLocal (value) {
	this.$store.dispatch('setOption', { name: 'hoverPreview', value })
	},
	muteWordsString (value) {
	value = filter(value.split('\n'), (word) => trim(word).length > 0)
	this.$store.dispatch('setOption', { name: 'muteWords', value })
	},
	collapseMessageWithSubjectLocal (value) {
	this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value })
	},
	scopeCopyLocal (value) {
	this.$store.dispatch('setOption', { name: 'scopeCopy', value })
	},
	alwaysShowSubjectInputLocal (value) {
	this.$store.dispatch('setOption', { name: 'alwaysShowSubjectInput', value })
	},
	subjectLineBehaviorLocal (value) {
	this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value })
	},
	postContentTypeLocal (value) {
	this.$store.dispatch('setOption', { name: 'postContentType', value })
	},
	stopGifs (value) {
	this.$store.dispatch('setOption', { name: 'stopGifs', value })
	},
	webPushNotificationsLocal (value) {
	this.$store.dispatch('setOption', { name: 'webPushNotifications', value })
	if (value) this.$store.dispatch('registerPushNotifications')
	},
	playVideosInModal (value) {
	this.$store.dispatch('setOption', { name: 'playVideosInModal', value })
	},
	useContainFit (value) {
	this.$store.dispatch('setOption', { name: 'useContainFit', value })
	+ },
	+ maxThumbnails (value) {
	+ if (value < 0) {
	+ value = 0
	+ this.maxThumbnails = 0
	+ }
	+ value = this.maxThumbnails = Math.floor(value)
	+ this.$store.dispatch('setOption', { name: 'maxThumbnails', value })
	}
	}
	}

	export default settings
	diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
	index f5e00995f9..16814f6528 100644
	--- a/src/components/settings/settings.vue
	+++ b/src/components/settings/settings.vue
	@@ -1,338 +1,346 @@
	<template>
	<div class="settings panel panel-default">
	<div class="panel-heading">
	<div class="title">
	{{$t('settings.settings')}}
	</div>

	<transition name="fade">
	<template v-if="currentSaveStateNotice">
	<div @click.prevent class="alert error" v-if="currentSaveStateNotice.error">
	{{ $t('settings.saving_err') }}
	</div>

	<div @click.prevent class="alert transparent" v-if="!currentSaveStateNotice.error">
	{{ $t('settings.saving_ok') }}
	</div>
	</template>
	</transition>
	</div>
	<div class="panel-body">
	<keep-alive>
	<tab-switcher>
	<div :label="$t('settings.general')" >
	<div class="setting-item">
	<h2>{{ $t('settings.interface') }}</h2>
	<ul class="setting-list">
	<li>
	<interface-language-switcher />
	</li>
	<li v-if="instanceSpecificPanelPresent">
	<input type="checkbox" id="hideISP" v-model="hideISPLocal">
	<label for="hideISP">{{$t('settings.hide_isp')}}</label>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{$t('nav.timeline')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
	<label for="collapseMessageWithSubject">
	{{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="streaming" v-model="streamingLocal">
	<label for="streaming">{{$t('settings.streaming')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!streamingLocal" type="checkbox" id="pauseOnUnfocused" v-model="pauseOnUnfocusedLocal">
	<label for="pauseOnUnfocused">{{$t('settings.pause_on_unfocused')}}</label>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="autoload" v-model="autoLoadLocal">
	<label for="autoload">{{$t('settings.autoload')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal">
	<label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.composing')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="scopeCopy" v-model="scopeCopyLocal">
	<label for="scopeCopy">
	{{$t('settings.scope_copy')}} {{$t('settings.instance_default', { value: scopeCopyDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="subjectHide" v-model="alwaysShowSubjectInputLocal">
	<label for="subjectHide">
	{{$t('settings.subject_input_always_show')}} {{$t('settings.instance_default', { value: alwaysShowSubjectInputDefault })}}
	</label>
	</li>
	<li>
	<div>
	{{$t('settings.subject_line_behavior')}}
	<label for="subjectLineBehavior" class="select">
	<select id="subjectLineBehavior" v-model="subjectLineBehaviorLocal">
	<option value="email">
	{{$t('settings.subject_line_email')}}
	{{subjectLineBehaviorDefault == 'email' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="masto">
	{{$t('settings.subject_line_mastodon')}}
	{{subjectLineBehaviorDefault == 'mastodon' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="noop">
	{{$t('settings.subject_line_noop')}}
	{{subjectLineBehaviorDefault == 'noop' ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	<li>
	<div>
	{{$t('settings.post_status_content_type')}}
	<label for="postContentType" class="select">
	<select id="postContentType" v-model="postContentTypeLocal">
	<option value="text/plain">
	{{$t('settings.status_content_type_plain')}}
	{{postContentTypeDefault == 'text/plain' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="text/html">
	HTML
	{{postContentTypeDefault == 'text/html' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="text/markdown">
	Markdown
	{{postContentTypeDefault == 'text/markdown' ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.attachments')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="hideAttachments" v-model="hideAttachmentsLocal">
	<label for="hideAttachments">{{$t('settings.hide_attachments_in_tl')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hideAttachmentsInConv" v-model="hideAttachmentsInConvLocal">
	<label for="hideAttachmentsInConv">{{$t('settings.hide_attachments_in_convo')}}</label>
	</li>
	+ <li>
	+ <label for="maxThumbnails">{{$t('settings.max_thumbnails')}}</label>
	+ <input class="number-input" type="number" id="maxThumbnails" v-model.number="maxThumbnails" min="0" step="1">
	+ </li>
	<li>
	<input type="checkbox" id="hideNsfw" v-model="hideNsfwLocal">
	<label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label>
	</li>
	<ul class="setting-list suboptions" >
	<li>
	<input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
	<label for="preloadImage">{{$t('settings.preload_images')}}</label>
	</li>
	<li>
	<input type="checkbox" id="useOneClickNsfw" v-model="useOneClickNsfw">
	<label for="useOneClickNsfw">{{$t('settings.use_one_click_nsfw')}}</label>
	</li>
	</ul>
	<li>
	<input type="checkbox" id="stopGifs" v-model="stopGifs">
	<label for="stopGifs">{{$t('settings.stop_gifs')}}</label>
	</li>
	<li>
	<input type="checkbox" id="loopVideo" v-model="loopVideoLocal">
	<label for="loopVideo">{{$t('settings.loop_video')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!loopVideoLocal \|\| !loopSilentAvailable" type="checkbox" id="loopVideoSilentOnly" v-model="loopVideoSilentOnlyLocal">
	<label for="loopVideoSilentOnly">{{$t('settings.loop_video_silent_only')}}</label>
	<div v-if="!loopSilentAvailable" class="unavailable">
	<i class="icon-globe"/>! {{$t('settings.limited_availability')}}
	</div>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="playVideosInModal" v-model="playVideosInModal">
	<label for="playVideosInModal">{{$t('settings.play_videos_in_modal')}}</label>
	</li>
	<li>
	<input type="checkbox" id="useContainFit" v-model="useContainFit">
	<label for="useContainFit">{{$t('settings.use_contain_fit')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.notifications')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="webPushNotifications" v-model="webPushNotificationsLocal">
	<label for="webPushNotifications">
	{{$t('settings.enable_web_push_notifications')}}
	</label>
	</li>
	</ul>
	</div>
	</div>

	<div :label="$t('settings.theme')" >
	<div class="setting-item">
	<style-switcher></style-switcher>
	</div>
	</div>

	<div :label="$t('settings.filtering')" >
	<div class="setting-item">
	<div class="select-multiple">
	<span class="label">{{$t('settings.notification_visibility')}}</span>
	<ul class="option-list">
	<li>
	<input type="checkbox" id="notification-visibility-likes" v-model="notificationVisibilityLocal.likes">
	<label for="notification-visibility-likes">
	{{$t('settings.notification_visibility_likes')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-repeats" v-model="notificationVisibilityLocal.repeats">
	<label for="notification-visibility-repeats">
	{{$t('settings.notification_visibility_repeats')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-follows" v-model="notificationVisibilityLocal.follows">
	<label for="notification-visibility-follows">
	{{$t('settings.notification_visibility_follows')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-mentions" v-model="notificationVisibilityLocal.mentions">
	<label for="notification-visibility-mentions">
	{{$t('settings.notification_visibility_mentions')}}
	</label>
	</li>
	</ul>
	</div>
	<div>
	{{$t('settings.replies_in_timeline')}}
	<label for="replyVisibility" class="select">
	<select id="replyVisibility" v-model="replyVisibilityLocal">
	<option value="all" selected>{{$t('settings.reply_visibility_all')}}</option>
	<option value="following">{{$t('settings.reply_visibility_following')}}</option>
	<option value="self">{{$t('settings.reply_visibility_self')}}</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	<div>
	<input type="checkbox" id="hidePostStats" v-model="hidePostStatsLocal">
	<label for="hidePostStats">
	{{$t('settings.hide_post_stats')}} {{$t('settings.instance_default', { value: hidePostStatsDefault })}}
	</label>
	</div>
	<div>
	<input type="checkbox" id="hideUserStats" v-model="hideUserStatsLocal">
	<label for="hideUserStats">
	{{$t('settings.hide_user_stats')}} {{$t('settings.instance_default', { value: hideUserStatsDefault })}}
	</label>
	</div>
	</div>
	<div class="setting-item">
	<div>
	<p>{{$t('settings.filtering_explanation')}}</p>
	<textarea id="muteWords" v-model="muteWordsString"></textarea>
	</div>
	<div>
	<input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal">
	<label for="hideFilteredStatuses">
	{{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}}
	</label>
	</div>
	</div>
	</div>
	</tab-switcher>
	</keep-alive>
	</div>
	</div>
	</template>

	<script src="./settings.js">
	</script>

	<style lang="scss">
	@import '../../_variables.scss';

	.setting-item {
	border-bottom: 2px solid var(--fg, $fallback--fg);
	margin: 1em 1em 1.4em;
	padding-bottom: 1.4em;

	> div {
	margin-bottom: .5em;
	&:last-child {
	margin-bottom: 0;
	}
	}

	&:last-child {
	border-bottom: none;
	padding-bottom: 0;
	margin-bottom: 1em;
	}

	select {
	min-width: 10em;
	}


	textarea {
	width: 100%;
	height: 100px;
	}

	.unavailable,
	.unavailable i {
	color: var(--cRed, $fallback--cRed);
	color: $fallback--cRed;
	}

	.btn {
	min-height: 28px;
	min-width: 10em;
	padding: 0 2em;
	}
	+
	+ .number-input {
	+ max-width: 6em;
	+ }
	}
	.select-multiple {
	display: flex;
	.option-list {
	margin: 0;
	padding-left: .5em;
	}
	}
	.setting-list,
	.option-list{
	list-style-type: none;
	padding-left: 2em;
	li {
	margin-bottom: 0.5em;
	}
	.suboptions {
	margin-top: 0.3em
	}
	}
	</style>
	diff --git a/src/components/status/status.js b/src/components/status/status.js
	index 0273a5beec..fab2fe6254 100644
	--- a/src/components/status/status.js
	+++ b/src/components/status/status.js
	@@ -1,392 +1,394 @@
	import Attachment from '../attachment/attachment.vue'
	import FavoriteButton from '../favorite_button/favorite_button.vue'
	import RetweetButton from '../retweet_button/retweet_button.vue'
	import DeleteButton from '../delete_button/delete_button.vue'
	import PostStatusForm from '../post_status_form/post_status_form.vue'
	import UserCardContent from '../user_card_content/user_card_content.vue'
	import UserAvatar from '../user_avatar/user_avatar.vue'
	import Gallery from '../gallery/gallery.vue'
	import LinkPreview from '../link-preview/link-preview.vue'
	import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
	import fileType from 'src/services/file_type/file_type.service'
	import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
	import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
	import { filter, find, unescape } from 'lodash'

	const Status = {
	name: 'Status',
	props: [
	'statusoid',
	'expandable',
	'inConversation',
	'focused',
	'highlight',
	'compact',
	'replies',
	'noReplyLinks',
	'noHeading',
	'inlineExpanded'
	],
	data () {
	return {
	replying: false,
	expanded: false,
	unmuted: false,
	userExpanded: false,
	preview: null,
	showPreview: false,
	showingTall: this.inConversation && this.focused,
	showingLongSubject: false,
	expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
	? !this.$store.state.instance.collapseMessageWithSubject
	: !this.$store.state.config.collapseMessageWithSubject,
	- betterShadow: this.$store.state.interface.browserSupport.cssFilter,
	- maxAttachments: 9
	+ betterShadow: this.$store.state.interface.browserSupport.cssFilter
	}
	},
	computed: {
	localCollapseSubjectDefault () {
	return typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
	? this.$store.state.instance.collapseMessageWithSubject
	: this.$store.state.config.collapseMessageWithSubject
	},
	muteWords () {
	return this.$store.state.config.muteWords
	},
	repeaterClass () {
	const user = this.statusoid.user
	return highlightClass(user)
	},
	userClass () {
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	return highlightClass(user)
	},
	deleted () {
	return this.statusoid.deleted
	},
	repeaterStyle () {
	const user = this.statusoid.user
	const highlight = this.$store.state.config.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	userStyle () {
	if (this.noHeading) return
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	const highlight = this.$store.state.config.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	hideAttachments () {
	return (this.$store.state.config.hideAttachments && !this.inConversation) \|\|
	(this.$store.state.config.hideAttachmentsInConv && this.inConversation)
	},
	userProfileLink () {
	return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
	},
	replyProfileLink () {
	if (this.isReply) {
	return this.generateUserProfileLink(this.status.in_reply_to_user_id, this.replyToName)
	}
	},
	retweet () { return !!this.statusoid.retweeted_status },
	retweeter () { return this.statusoid.user.name \|\| this.statusoid.user.screen_name },
	retweeterHtml () { return this.statusoid.user.name_html },
	retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
	status () {
	if (this.retweet) {
	return this.statusoid.retweeted_status
	} else {
	return this.statusoid
	}
	},
	loggedIn () {
	return !!this.$store.state.users.currentUser
	},
	muteWordHits () {
	const statusText = this.status.text.toLowerCase()
	const hits = filter(this.muteWords, (muteWord) => {
	return statusText.includes(muteWord.toLowerCase())
	})

	return hits
	},
	muted () { return !this.unmuted && (this.status.user.muted \|\| this.muteWordHits.length > 0) },
	hideFilteredStatuses () {
	return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
	? this.$store.state.instance.hideFilteredStatuses
	: this.$store.state.config.hideFilteredStatuses
	},
	hideStatus () {
	return (this.hideReply \|\| this.deleted) \|\| (this.muted && this.hideFilteredStatuses)
	},
	isFocused () {
	// retweet or root of an expanded conversation
	if (this.focused) {
	return true
	} else if (!this.inConversation) {
	return false
	}
	// use conversation highlight only when in conversation
	return this.status.id === this.highlight
	},
	// This is a bit hacky, but we want to approximate post height before rendering
	// so we count newlines (masto uses <p> for paragraphs, GS uses <br> between them)
	// as well as approximate line count by counting characters and approximating ~80
	// per line.
	//
	// Using max-height + overflow: auto for status components resulted in false positives
	// very often with japanese characters, and it was very annoying.
	tallStatus () {
	const lengthScore = this.status.statusnet_html.split(/<p\|<br/).length + this.status.text.length / 80
	return lengthScore > 20
	},
	longSubject () {
	return this.status.summary.length > 900
	},
	isReply () {
	return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
	},
	replyToName () {
	const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id]
	if (user) {
	return user.screen_name
	} else {
	return this.status.in_reply_to_screen_name
	}
	},
	hideReply () {
	if (this.$store.state.config.replyVisibility === 'all') {
	return false
	}
	if (this.inlineExpanded \|\| this.expanded \|\| this.inConversation \|\| !this.isReply) {
	return false
	}
	if (this.status.user.id === this.$store.state.users.currentUser.id) {
	return false
	}
	if (this.status.type === 'retweet') {
	return false
	}
	var checkFollowing = this.$store.state.config.replyVisibility === 'following'
	for (var i = 0; i < this.status.attentions.length; ++i) {
	if (this.status.user.id === this.status.attentions[i].id) {
	continue
	}
	if (checkFollowing && this.status.attentions[i].following) {
	return false
	}
	if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) {
	return false
	}
	}
	return this.status.attentions.length > 0
	},
	hideSubjectStatus () {
	if (this.tallStatus && !this.localCollapseSubjectDefault) {
	return false
	}
	return !this.expandingSubject && this.status.summary
	},
	hideTallStatus () {
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	if (this.showingTall) {
	return false
	}
	return this.tallStatus
	},
	showingMore () {
	return (this.tallStatus && this.showingTall) \|\| (this.status.summary && this.expandingSubject)
	},
	nsfwClickthrough () {
	if (!this.status.nsfw) {
	return false
	}
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	return true
	},
	replySubject () {
	if (!this.status.summary) return ''
	const decodedSummary = unescape(this.status.summary)
	const behavior = typeof this.$store.state.config.subjectLineBehavior === 'undefined'
	? this.$store.state.instance.subjectLineBehavior
	: this.$store.state.config.subjectLineBehavior
	const startsWithRe = decodedSummary.match(/^re[: ]/i)
	if (behavior !== 'noop' && startsWithRe \|\| behavior === 'masto') {
	return decodedSummary
	} else if (behavior === 'email') {
	return 're: '.concat(decodedSummary)
	} else if (behavior === 'noop') {
	return ''
	}
	},
	attachmentSize () {
	if ((this.$store.state.config.hideAttachments && !this.inConversation) \|\|
	(this.$store.state.config.hideAttachmentsInConv && this.inConversation) \|\|
	- (this.status.attachments.length > this.maxAttachments)) {
	+ (this.status.attachments.length > this.maxThumbnails)) {
	return 'hide'
	} else if (this.compact) {
	return 'small'
	}
	return 'normal'
	},
	galleryTypes () {
	if (this.attachmentSize === 'hide') {
	return []
	}
	return this.$store.state.config.playVideosInModal
	? ['image', 'video']
	: ['image']
	},
	galleryAttachments () {
	return this.status.attachments.filter(
	file => fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	},
	nonGalleryAttachments () {
	return this.status.attachments.filter(
	file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	+ },
	+ maxThumbnails () {
	+ return this.$store.state.config.maxThumbnails
	}
	},
	components: {
	Attachment,
	FavoriteButton,
	RetweetButton,
	DeleteButton,
	PostStatusForm,
	UserCardContent,
	UserAvatar,
	Gallery,
	LinkPreview
	},
	methods: {
	visibilityIcon (visibility) {
	switch (visibility) {
	case 'private':
	return 'icon-lock'
	case 'unlisted':
	return 'icon-lock-open-alt'
	case 'direct':
	return 'icon-mail-alt'
	default:
	return 'icon-globe'
	}
	},
	linkClicked (event) {
	let { target } = event
	if (target.tagName === 'SPAN') {
	target = target.parentNode
	}
	if (target.tagName === 'A') {
	if (target.className.match(/mention/)) {
	const href = target.href
	const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
	if (attn) {
	event.stopPropagation()
	event.preventDefault()
	const link = this.generateUserProfileLink(attn.id, attn.screen_name)
	this.$router.push(link)
	return
	}
	}
	if (target.className.match(/hashtag/)) {
	// Extract tag name from link url
	const tag = extractTagFromUrl(target.href)
	if (tag) {
	const link = this.generateTagLink(tag)
	this.$router.push(link)
	return
	}
	}
	window.open(target.href, '_blank')
	}
	},
	toggleReplying () {
	this.replying = !this.replying
	},
	gotoOriginal (id) {
	// only handled by conversation, not status_or_conversation
	if (this.inConversation) {
	this.$emit('goto', id)
	}
	},
	toggleExpanded () {
	this.$emit('toggleExpanded')
	},
	toggleMute () {
	this.unmuted = !this.unmuted
	},
	toggleUserExpanded () {
	this.userExpanded = !this.userExpanded
	},
	toggleShowMore () {
	if (this.showingTall) {
	this.showingTall = false
	} else if (this.expandingSubject && this.status.summary) {
	this.expandingSubject = false
	} else if (this.hideTallStatus) {
	this.showingTall = true
	} else if (this.hideSubjectStatus && this.status.summary) {
	this.expandingSubject = true
	}
	},
	replyEnter (id, event) {
	this.showPreview = true
	const targetId = id
	const statuses = this.$store.state.statuses.allStatuses

	if (!this.preview) {
	// if we have the status somewhere already
	this.preview = find(statuses, { 'id': targetId })
	// or if we have to fetch it
	if (!this.preview) {
	this.$store.state.api.backendInteractor.fetchStatus({id}).then((status) => {
	this.preview = status
	})
	}
	} else if (this.preview.id !== targetId) {
	this.preview = find(statuses, { 'id': targetId })
	}
	},
	replyLeave () {
	this.showPreview = false
	},
	generateUserProfileLink (id, name) {
	return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
	},
	generateTagLink (tag) {
	return `/tag/${tag}`
	},
	setMedia () {
	const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
	return () => this.$store.dispatch('setMedia', attachments)
	}
	},
	watch: {
	'highlight': function (id) {
	if (this.status.id === id) {
	let rect = this.$el.getBoundingClientRect()
	if (rect.top < 100) {
	// Post is above screen, match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.height >= (window.innerHeight - 50)) {
	// Post we want to see is taller than screen so match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.bottom > window.innerHeight - 50) {
	// Post is below screen, match its bottom to screen bottom
	window.scrollBy(0, rect.bottom - window.innerHeight + 50)
	}
	}
	}
	},
	filters: {
	capitalize: function (str) {
	return str.charAt(0).toUpperCase() + str.slice(1)
	}
	}
	}

	export default Status
	diff --git a/src/i18n/en.json b/src/i18n/en.json
	index 64753f1dc1..8e837d2f18 100644
	--- a/src/i18n/en.json
	+++ b/src/i18n/en.json
	@@ -1,413 +1,414 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Scope options",
	"text_limit": "Text limit",
	"title": "Features",
	"who_to_follow": "Who to follow"
	},
	"finder": {
	"error_fetching_user": "Error fetching user",
	"find_user": "Find user"
	},
	"general": {
	"apply": "Apply",
	"submit": "Submit",
	"more": "More",
	"generic_error": "An error occured",
	"optional": "optional"
	},
	"image_cropper": {
	"crop_picture": "Crop picture",
	"save": "Save",
	"cancel": "Cancel"
	},
	"login": {
	"login": "Log in",
	"description": "Log in with OAuth",
	"logout": "Log out",
	"password": "Password",
	"placeholder": "e.g. lain",
	"register": "Register",
	"username": "Username",
	"hint": "Log in to join the discussion"
	},
	"media_modal": {
	"previous": "Previous",
	"next": "Next"
	},
	"nav": {
	"about": "About",
	"back": "Back",
	"chat": "Local Chat",
	"friend_requests": "Follow Requests",
	"mentions": "Mentions",
	"dms": "Direct Messages",
	"public_tl": "Public Timeline",
	"timeline": "Timeline",
	"twkn": "The Whole Known Network",
	"user_search": "User Search",
	"who_to_follow": "Who to follow",
	"preferences": "Preferences"
	},
	"notifications": {
	"broken_favorite": "Unknown status, searching for it...",
	"favorited_you": "favorited your status",
	"followed_you": "followed you",
	"load_older": "Load older notifications",
	"notifications": "Notifications",
	"read": "Read!",
	"repeated_you": "repeated your status",
	"no_more_notifications": "No more notifications"
	},
	"post_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_link": "locked",
	"attachments_sensitive": "Mark attachments as sensitive",
	"content_type": {
	"plain_text": "Plain text"
	},
	"content_warning": "Subject (optional)",
	"default": "Just landed in L.A.",
	"direct_warning": "This post will only be visible to all the mentioned users.",
	"posting": "Posting",
	"scope": {
	"direct": "Direct - Post to mentioned users only",
	"private": "Followers-only - Post to followers only",
	"public": "Public - Post to public timelines",
	"unlisted": "Unlisted - Do not post to public timelines"
	}
	},
	"registration": {
	"bio": "Bio",
	"email": "Email",
	"fullname": "Display name",
	"password_confirm": "Password confirmation",
	"registration": "Registration",
	"token": "Invite token",
	"captcha": "CAPTCHA",
	"new_captcha": "Click the image to get a new captcha",
	"username_placeholder": "e.g. lain",
	"fullname_placeholder": "e.g. Lain Iwakura",
	"bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
	"validations": {
	"username_required": "cannot be left blank",
	"fullname_required": "cannot be left blank",
	"email_required": "cannot be left blank",
	"password_required": "cannot be left blank",
	"password_confirmation_required": "cannot be left blank",
	"password_confirmation_match": "should be the same as password"
	}
	},
	"settings": {
	"attachmentRadius": "Attachments",
	"attachments": "Attachments",
	"autoload": "Enable automatic loading when scrolled to the bottom",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notifications)",
	"avatarRadius": "Avatars",
	"background": "Background",
	"bio": "Bio",
	"blocks_tab": "Blocks",
	"btnRadius": "Buttons",
	"cBlue": "Blue (Reply, follow)",
	"cGreen": "Green (Retweet)",
	"cOrange": "Orange (Favorite)",
	"cRed": "Red (Cancel)",
	"change_password": "Change Password",
	"change_password_error": "There was an issue changing your password.",
	"changed_password": "Password changed successfully!",
	"collapse_subject": "Collapse posts with subjects",
	"composing": "Composing",
	"confirm_new_password": "Confirm new password",
	"current_avatar": "Your current avatar",
	"current_password": "Current password",
	"current_profile_banner": "Your current profile banner",
	"data_import_export_tab": "Data Import / Export",
	"default_vis": "Default visibility scope",
	"delete_account": "Delete Account",
	"delete_account_description": "Permanently delete your account and all your messages.",
	"delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
	"delete_account_instructions": "Type your password in the input below to confirm account deletion.",
	"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
	"export_theme": "Save preset",
	"filtering": "Filtering",
	"filtering_explanation": "All statuses containing these words will be muted, one per line",
	"follow_export": "Follow export",
	"follow_export_button": "Export your follows to a csv file",
	"follow_export_processing": "Processing, you'll soon be asked to download your file",
	"follow_import": "Follow import",
	"follow_import_error": "Error importing followers",
	"follows_imported": "Follows imported! Processing them will take a while.",
	"foreground": "Foreground",
	"general": "General",
	"hide_attachments_in_convo": "Hide attachments in conversations",
	"hide_attachments_in_tl": "Hide attachments in timeline",
	+ "max_thumbnails": "Maximum amount of thumbnails per post",
	"hide_isp": "Hide instance-specific panel",
	"preload_images": "Preload images",
	"use_one_click_nsfw": "Open NSFW attachments with just one click",
	"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
	"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
	"hide_filtered_statuses": "Hide filtered statuses",
	"import_followers_from_a_csv_file": "Import follows from a csv file",
	"import_theme": "Load preset",
	"inputRadius": "Input fields",
	"checkboxRadius": "Checkboxes",
	"instance_default": "(default: {value})",
	"instance_default_simple": "(default)",
	"interface": "Interface",
	"interfaceLanguage": "Interface language",
	"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
	"limited_availability": "Unavailable in your browser",
	"links": "Links",
	"lock_account_description": "Restrict your account to approved followers only",
	"loop_video": "Loop videos",
	"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
	"mutes_tab": "Mutes",
	"play_videos_in_modal": "Play videos directly in the media viewer",
	"use_contain_fit": "Don't crop the attachment in thumbnails",
	"name": "Name",
	"name_bio": "Name & Bio",
	"new_password": "New password",
	"notification_visibility": "Types of notifications to show",
	"notification_visibility_follows": "Follows",
	"notification_visibility_likes": "Likes",
	"notification_visibility_mentions": "Mentions",
	"notification_visibility_repeats": "Repeats",
	"no_rich_text_description": "Strip rich text formatting from all posts",
	"no_blocks": "No blocks",
	"no_mutes": "No mutes",
	"hide_follows_description": "Don't show who I'm following",
	"hide_followers_description": "Don't show who's following me",
	"show_admin_badge": "Show Admin badge in my profile",
	"show_moderator_badge": "Show Moderator badge in my profile",
	"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
	"panelRadius": "Panels",
	"pause_on_unfocused": "Pause streaming when tab is not focused",
	"presets": "Presets",
	"profile_background": "Profile Background",
	"profile_banner": "Profile Banner",
	"profile_tab": "Profile",
	"radii_help": "Set up interface edge rounding (in pixels)",
	"replies_in_timeline": "Replies in timeline",
	"reply_link_preview": "Enable reply-link preview on mouse hover",
	"reply_visibility_all": "Show all replies",
	"reply_visibility_following": "Only show replies directed at me or users I'm following",
	"reply_visibility_self": "Only show replies directed at me",
	"saving_err": "Error saving settings",
	"saving_ok": "Settings saved",
	"security_tab": "Security",
	"scope_copy": "Copy scope when replying (DMs are always copied)",
	"set_new_avatar": "Set new avatar",
	"set_new_profile_background": "Set new profile background",
	"set_new_profile_banner": "Set new profile banner",
	"settings": "Settings",
	"subject_input_always_show": "Always show subject field",
	"subject_line_behavior": "Copy subject when replying",
	"subject_line_email": "Like email: \"re: subject\"",
	"subject_line_mastodon": "Like mastodon: copy as is",
	"subject_line_noop": "Do not copy",
	"post_status_content_type": "Post status content type",
	"status_content_type_plain": "Plain text",
	"stop_gifs": "Play-on-hover GIFs",
	"streaming": "Enable automatic streaming of new posts when scrolled to the top",
	"text": "Text",
	"theme": "Theme",
	"theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
	"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
	"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
	"tooltipRadius": "Tooltips/alerts",
	"upload_a_photo": "Upload a photo",
	"user_settings": "User Settings",
	"values": {
	"false": "no",
	"true": "yes"
	},
	"notifications": "Notifications",
	"enable_web_push_notifications": "Enable web push notifications",
	"style": {
	"switcher": {
	"keep_color": "Keep colors",
	"keep_shadows": "Keep shadows",
	"keep_opacity": "Keep opacity",
	"keep_roundness": "Keep roundness",
	"keep_fonts": "Keep fonts",
	"save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
	"reset": "Reset",
	"clear_all": "Clear all",
	"clear_opacity": "Clear opacity"
	},
	"common": {
	"color": "Color",
	"opacity": "Opacity",
	"contrast": {
	"hint": "Contrast ratio is {ratio}, it {level} {context}",
	"level": {
	"aa": "meets Level AA guideline (minimal)",
	"aaa": "meets Level AAA guideline (recommended)",
	"bad": "doesn't meet any accessibility guidelines"
	},
	"context": {
	"18pt": "for large (18pt+) text",
	"text": "for text"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Common",
	"main": "Common colors",
	"foreground_hint": "See \"Advanced\" tab for more detailed control",
	"rgbo": "Icons, accents, badges"
	},
	"advanced_colors": {
	"_tab_label": "Advanced",
	"alert": "Alert background",
	"alert_error": "Error",
	"badge": "Badge background",
	"badge_notification": "Notification",
	"panel_header": "Panel header",
	"top_bar": "Top bar",
	"borders": "Borders",
	"buttons": "Buttons",
	"inputs": "Input fields",
	"faint_text": "Faded text"
	},
	"radii": {
	"_tab_label": "Roundness"
	},
	"shadows": {
	"_tab_label": "Shadow and lighting",
	"component": "Component",
	"override": "Override",
	"shadow_id": "Shadow #{value}",
	"blur": "Blur",
	"spread": "Spread",
	"inset": "Inset",
	"hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
	"filter_hint": {
	"always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
	"drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
	"avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
	"spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
	"inset_classic": "Inset shadows will be using {0}"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Panel header",
	"topBar": "Top bar",
	"avatar": "User avatar (in profile view)",
	"avatarStatus": "User avatar (in post display)",
	"popup": "Popups and tooltips",
	"button": "Button",
	"buttonHover": "Button (hover)",
	"buttonPressed": "Button (pressed)",
	"buttonPressedHover": "Button (pressed+hover)",
	"input": "Input field"
	}
	},
	"fonts": {
	"_tab_label": "Fonts",
	"help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
	"components": {
	"interface": "Interface",
	"input": "Input fields",
	"post": "Post text",
	"postCode": "Monospaced text in a post (rich text)"
	},
	"family": "Font name",
	"size": "Size (in px)",
	"weight": "Weight (boldness)",
	"custom": "Custom"
	},
	"preview": {
	"header": "Preview",
	"content": "Content",
	"error": "Example error",
	"button": "Button",
	"text": "A bunch of more {0} and {1}",
	"mono": "content",
	"input": "Just landed in L.A.",
	"faint_link": "helpful manual",
	"fine_print": "Read our {0} to learn nothing useful!",
	"header_faint": "This is fine",
	"checkbox": "I have skimmed over terms and conditions",
	"link": "a nice lil' link"
	}
	}
	},
	"timeline": {
	"collapse": "Collapse",
	"conversation": "Conversation",
	"error_fetching": "Error fetching updates",
	"load_older": "Load older statuses",
	"no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
	"repeated": "repeated",
	"show_new": "Show new",
	"up_to_date": "Up-to-date",
	"no_more_statuses": "No more statuses",
	"no_statuses": "No statuses"
	},
	"user_card": {
	"approve": "Approve",
	"block": "Block",
	"blocked": "Blocked!",
	"deny": "Deny",
	"favorites": "Favorites",
	"follow": "Follow",
	"follow_sent": "Request sent!",
	"follow_progress": "Requesting…",
	"follow_again": "Send request again?",
	"follow_unfollow": "Unfollow",
	"followees": "Following",
	"followers": "Followers",
	"following": "Following!",
	"follows_you": "Follows you!",
	"its_you": "It's you!",
	"media": "Media",
	"mute": "Mute",
	"muted": "Muted",
	"per_day": "per day",
	"remote_follow": "Remote follow",
	"statuses": "Statuses",
	"unblock": "Unblock",
	"unblock_progress": "Unblocking...",
	"block_progress": "Blocking...",
	"unmute": "Unmute",
	"unmute_progress": "Unmuting...",
	"mute_progress": "Muting..."
	},
	"user_profile": {
	"timeline_title": "User Timeline"
	},
	"who_to_follow": {
	"more": "More",
	"who_to_follow": "Who to follow"
	},
	"tool_tip": {
	"media_upload": "Upload Media",
	"repeat": "Repeat",
	"reply": "Reply",
	"favorite": "Favorite",
	"user_settings": "User Settings"
	},
	"upload":{
	"error": {
	"base": "Upload failed.",
	"file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Try again later"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/fi.json b/src/i18n/fi.json
	index 5a0c1ea822..a8259ca8b7 100644
	--- a/src/i18n/fi.json
	+++ b/src/i18n/fi.json
	@@ -1,267 +1,268 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media-välityspalvelin",
	"scope_options": "Näkyvyyden rajaus",
	"text_limit": "Tekstin pituusraja",
	"title": "Ominaisuudet",
	"who_to_follow": "Seurausehdotukset"
	},
	"finder": {
	"error_fetching_user": "Virhe hakiessa käyttäjää",
	"find_user": "Hae käyttäjä"
	},
	"general": {
	"apply": "Aseta",
	"submit": "Lähetä",
	"more": "Lisää",
	"generic_error": "Virhe tapahtui"
	},
	"login": {
	"login": "Kirjaudu sisään",
	"description": "Kirjaudu sisään OAuthilla",
	"logout": "Kirjaudu ulos",
	"password": "Salasana",
	"placeholder": "esim. Seppo",
	"register": "Rekisteröidy",
	"username": "Käyttäjänimi"
	},
	"nav": {
	"about": "Tietoja",
	"back": "Takaisin",
	"chat": "Paikallinen Chat",
	"friend_requests": "Seurauspyynnöt",
	"mentions": "Maininnat",
	"dms": "Yksityisviestit",
	"public_tl": "Julkinen Aikajana",
	"timeline": "Aikajana",
	"twkn": "Koko Tunnettu Verkosto",
	"user_search": "Käyttäjähaku",
	"who_to_follow": "Seurausehdotukset",
	"preferences": "Asetukset"
	},
	"notifications": {
	"broken_favorite": "Viestiä ei löydetty...",
	"favorited_you": "tykkäsi viestistäsi",
	"followed_you": "seuraa sinua",
	"load_older": "Lataa vanhempia ilmoituksia",
	"notifications": "Ilmoitukset",
	"read": "Lue!",
	"repeated_you": "toisti viestisi",
	"no_more_notifications": "Ei enempää ilmoituksia"
	},
	"post_status": {
	"new_status": "Uusi viesti",
	"account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
	"account_not_locked_warning_link": "lukittu",
	"attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
	"content_type": {
	"plain_text": "Tavallinen teksti"
	},
	"content_warning": "Aihe (valinnainen)",
	"default": "Tulin juuri saunasta.",
	"direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
	"posting": "Lähetetään",
	"scope": {
	"direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
	"private": "Vain-seuraajille - Näkyy vain seuraajillesi",
	"public": "Julkinen - Näkyy julkisilla aikajanoilla",
	"unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
	}
	},
	"registration": {
	"bio": "Kuvaus",
	"email": "Sähköposti",
	"fullname": "Koko nimi",
	"password_confirm": "Salasanan vahvistaminen",
	"registration": "Rekisteröityminen",
	"token": "Kutsuvaltuus",
	"captcha": "Varmenne",
	"new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
	"validations": {
	"username_required": "ei voi olla tyhjä",
	"fullname_required": "ei voi olla tyhjä",
	"email_required": "ei voi olla tyhjä",
	"password_required": "ei voi olla tyhjä",
	"password_confirmation_required": "ei voi olla tyhjä",
	"password_confirmation_match": "pitää vastata salasanaa"
	}
	},
	"settings": {
	"attachmentRadius": "Liitteet",
	"attachments": "Liitteet",
	"autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
	"avatar": "Profiilikuva",
	"avatarAltRadius": "Profiilikuvat (ilmoitukset)",
	"avatarRadius": "Profiilikuvat",
	"background": "Tausta",
	"bio": "Kuvaus",
	"btnRadius": "Napit",
	"cBlue": "Sininen (Vastaukset, seuraukset)",
	"cGreen": "Vihreä (Toistot)",
	"cOrange": "Oranssi (Tykkäykset)",
	"cRed": "Punainen (Peruminen)",
	"change_password": "Vaihda salasana",
	"change_password_error": "Virhe vaihtaessa salasanaa.",
	"changed_password": "Salasana vaihdettu!",
	"collapse_subject": "Minimoi viestit, joille on asetettu aihe",
	"composing": "Viestien laatiminen",
	"confirm_new_password": "Vahvista uusi salasana",
	"current_avatar": "Nykyinen profiilikuvasi",
	"current_password": "Nykyinen salasana",
	"current_profile_banner": "Nykyinen julisteesi",
	"data_import_export_tab": "Tietojen tuonti / vienti",
	"default_vis": "Oletusnäkyvyysrajaus",
	"delete_account": "Poista tili",
	"delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
	"delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
	"delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
	"export_theme": "Tallenna teema",
	"filtering": "Suodatus",
	"filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
	"follow_export": "Seurausten vienti",
	"follow_export_button": "Vie seurauksesi CSV-tiedostoon",
	"follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
	"follow_import": "Seurausten tuonti",
	"follow_import_error": "Virhe tuodessa seuraksia",
	"follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
	"foreground": "Korostus",
	"general": "Yleinen",
	"hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
	"hide_attachments_in_tl": "Piilota liitteet aikajanalla",
	+ "max_thumbnails": "Suurin sallittu määrä liitteitä esikatselussa",
	"hide_isp": "Piilota palvelimenkohtainen ruutu",
	"preload_images": "Esilataa kuvat",
	"use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
	"hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
	"hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
	"import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
	"import_theme": "Tuo tallennettu teema",
	"inputRadius": "Syöttökentät",
	"checkboxRadius": "Valintalaatikot",
	"instance_default": "(oletus: {value})",
	"instance_default_simple": "(oletus)",
	"interface": "Käyttöliittymä",
	"interfaceLanguage": "Käyttöliittymän kieli",
	"invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
	"limited_availability": "Ei saatavilla selaimessasi",
	"links": "Linkit",
	"lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
	"loop_video": "Uudelleentoista videot",
	"loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
	"play_videos_in_modal": "Toista videot modaalissa",
	"use_contain_fit": "Älä rajaa liitteitä esikatselussa",
	"name": "Nimi",
	"name_bio": "Nimi ja kuvaus",
	"new_password": "Uusi salasana",
	"notification_visibility": "Ilmoitusten näkyvyys",
	"notification_visibility_follows": "Seuraukset",
	"notification_visibility_likes": "Tykkäykset",
	"notification_visibility_mentions": "Maininnat",
	"notification_visibility_repeats": "Toistot",
	"no_rich_text_description": "Älä näytä tekstin muotoilua.",
	"hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
	"nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
	"panelRadius": "Ruudut",
	"pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
	"presets": "Valmiit teemat",
	"profile_background": "Taustakuva",
	"profile_banner": "Juliste",
	"profile_tab": "Profiili",
	"radii_help": "Aseta reunojen pyöristys (pikseleinä)",
	"replies_in_timeline": "Keskustelut aikajanalla",
	"reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
	"reply_visibility_all": "Näytä kaikki vastaukset",
	"reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
	"reply_visibility_self": "Näytä vain vastaukset minulle",
	"saving_err": "Virhe tallentaessa asetuksia",
	"saving_ok": "Asetukset tallennettu",
	"security_tab": "Tietoturva",
	"scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
	"set_new_avatar": "Aseta uusi profiilikuva",
	"set_new_profile_background": "Aseta uusi taustakuva",
	"set_new_profile_banner": "Aseta uusi juliste",
	"settings": "Asetukset",
	"subject_input_always_show": "Näytä aihe-kenttä",
	"subject_line_behavior": "Aihe-kentän kopiointi",
	"subject_line_email": "Kuten sähköposti: \"re: aihe\"",
	"subject_line_mastodon": "Kopioi sellaisenaan",
	"subject_line_noop": "Älä kopioi",
	"stop_gifs": "Toista giffit vain kohdistaessa",
	"streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
	"text": "Teksti",
	"theme": "Teema",
	"theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
	"theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
	"theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
	"tooltipRadius": "Ohje- tai huomioviestit",
	"user_settings": "Käyttäjän asetukset",
	"values": {
	"false": "pois päältä",
	"true": "päällä"
	}
	},
	"timeline": {
	"collapse": "Sulje",
	"conversation": "Keskustelu",
	"error_fetching": "Virhe ladatessa viestejä",
	"load_older": "Lataa vanhempia viestejä",
	"no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
	"repeated": "toisti",
	"show_new": "Näytä uudet",
	"up_to_date": "Ajantasalla",
	"no_more_statuses": "Ei enempää viestejä"
	},
	"user_card": {
	"approve": "Hyväksy",
	"block": "Estä",
	"blocked": "Estetty!",
	"deny": "Älä hyväksy",
	"follow": "Seuraa",
	"follow_sent": "Pyyntö lähetetty!",
	"follow_progress": "Pyydetään...",
	"follow_again": "Lähetä pyyntö uudestaan",
	"follow_unfollow": "Älä seuraa",
	"followees": "Seuraa",
	"followers": "Seuraajat",
	"following": "Seuraat!",
	"follows_you": "Seuraa sinua!",
	"its_you": "Sinun tili!",
	"mute": "Hiljennä",
	"muted": "Hiljennetty",
	"per_day": "päivässä",
	"remote_follow": "Seuraa muualta",
	"statuses": "Viestit"
	},
	"user_profile": {
	"timeline_title": "Käyttäjän aikajana"
	},
	"who_to_follow": {
	"more": "Lisää",
	"who_to_follow": "Seurausehdotukset"
	},
	"tool_tip": {
	"media_upload": "Lataa tiedosto",
	"repeat": "Toista",
	"reply": "Vastaa",
	"favorite": "Tykkää",
	"user_settings": "Käyttäjäasetukset"
	},
	"upload":{
	"error": {
	"base": "Lataus epäonnistui.",
	"file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Yritä uudestaan myöhemmin"
	},
	"file_size_units": {
	"B": "tavua",
	"KiB": "kt",
	"MiB": "Mt",
	"GiB": "Gt",
	"TiB": "Tt"
	}
	}
	}
	diff --git a/src/modules/config.js b/src/modules/config.js
	index 71f71376cb..1c30c203ee 100644
	--- a/src/modules/config.js
	+++ b/src/modules/config.js
	@@ -1,69 +1,70 @@
	import { set, delete as del } from 'vue'
	import { setPreset, applyTheme } from '../services/style_setter/style_setter.js'

	const browserLocale = (window.navigator.language \|\| 'en').split('-')[0]

	const defaultState = {
	colors: {},
	collapseMessageWithSubject: undefined, // instance default
	hideAttachments: false,
	hideAttachmentsInConv: false,
	+ maxThumbnails: 16,
	hideNsfw: true,
	preloadImage: true,
	loopVideo: true,
	loopVideoSilentOnly: true,
	autoLoad: true,
	streaming: false,
	hoverPreview: true,
	pauseOnUnfocused: true,
	stopGifs: false,
	replyVisibility: 'all',
	notificationVisibility: {
	follows: true,
	mentions: true,
	likes: true,
	repeats: true
	},
	webPushNotifications: false,
	muteWords: [],
	highlight: {},
	interfaceLanguage: browserLocale,
	scopeCopy: undefined, // instance default
	subjectLineBehavior: undefined, // instance default
	alwaysShowSubjectInput: undefined, // instance default
	postContentType: undefined // instance default
	}

	const config = {
	state: defaultState,
	mutations: {
	setOption (state, { name, value }) {
	set(state, name, value)
	},
	setHighlight (state, { user, color, type }) {
	const data = this.state.config.highlight[user]
	if (color \|\| type) {
	set(state.highlight, user, { color: color \|\| data.color, type: type \|\| data.type })
	} else {
	del(state.highlight, user)
	}
	}
	},
	actions: {
	setHighlight ({ commit, dispatch }, { user, color, type }) {
	commit('setHighlight', {user, color, type})
	},
	setOption ({ commit, dispatch }, { name, value }) {
	commit('setOption', {name, value})
	switch (name) {
	case 'theme':
	setPreset(value, commit)
	break
	case 'customTheme':
	applyTheme(value, commit)
	}
	}
	}
	}

	export default config

File Metadata

Mime Type: text/x-diff
Expires: Sun, Aug 9, 4:33 PM (1 d, 14 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1724718
Default Alt Text: (65 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions