aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/attachment/attachment.js6
-rw-r--r--src/components/settings/settings.js6
-rw-r--r--src/components/settings/settings.vue4
-rw-r--r--src/components/status/status.js8
-rw-r--r--src/components/user_settings/user_settings.js9
-rw-r--r--src/components/user_settings/user_settings.vue9
-rw-r--r--src/i18n/de.json3
-rw-r--r--src/i18n/en.json6
-rw-r--r--src/i18n/fi.json2
-rw-r--r--src/i18n/ja.json3
-rw-r--r--src/i18n/ko.json3
-rw-r--r--src/i18n/ru.json3
-rw-r--r--src/services/api/api.service.js2
-rw-r--r--src/services/entity_normalizer/entity_normalizer.service.js5
14 files changed, 29 insertions, 40 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 47939852..3b7f08dc 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -57,9 +57,9 @@ const Attachment = {
}
},
openModal (event) {
- const modalTypes = this.$store.state.config.playVideosInline
- ? ['image']
- : ['image', 'video']
+ const modalTypes = this.$store.state.config.playVideosInModal
+ ? ['image', 'video']
+ : ['image']
if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) ||
this.usePlaceHolder
) {
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 7000fa5e..8d138485 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -66,7 +66,7 @@ const settings = {
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
// Future spec, still not supported in Nightly 63 as of 08/2018
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
- playVideosInline: user.playVideosInline,
+ playVideosInModal: user.playVideosInModal,
useContainFit: user.useContainFit
}
},
@@ -164,8 +164,8 @@ const settings = {
this.$store.dispatch('setOption', { name: 'webPushNotifications', value })
if (value) this.$store.dispatch('registerPushNotifications')
},
- playVideosInline (value) {
- this.$store.dispatch('setOption', { name: 'playVideosInline', value })
+ playVideosInModal (value) {
+ this.$store.dispatch('setOption', { name: 'playVideosInModal', value })
},
useContainFit (value) {
this.$store.dispatch('setOption', { name: 'useContainFit', value })
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 08d659d6..9953780f 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -146,8 +146,8 @@
</ul>
</li>
<li>
- <input type="checkbox" id="playVideosInline" v-model="playVideosInline">
- <label for="playVideosInline">{{$t('settings.play_videos_inline')}}</label>
+ <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">
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ec4de516..c718fe9f 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -87,7 +87,7 @@ const Status = {
}
},
retweet () { return !!this.statusoid.retweeted_status },
- retweeter () { return this.statusoid.user.name },
+ retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name },
retweeterHtml () { return this.statusoid.user.name_html },
status () {
if (this.retweet) {
@@ -222,9 +222,9 @@ const Status = {
if (this.attachmentSize === 'hide') {
return []
}
- return this.$store.state.config.playVideosInline
- ? ['image']
- : ['image', 'video']
+ return this.$store.state.config.playVideosInModal
+ ? ['image', 'video']
+ : ['image']
},
galleryAttachments () {
return this.status.attachments.filter(
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 719a9c0c..9bd8aa00 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -10,8 +10,7 @@ const UserSettings = {
newLocked: this.$store.state.users.currentUser.locked,
newNoRichText: this.$store.state.users.currentUser.no_rich_text,
newDefaultScope: this.$store.state.users.currentUser.default_scope,
- hideFollowings: this.$store.state.users.currentUser.hide_followings,
- hideFollowers: this.$store.state.users.currentUser.hide_followers,
+ newHideNetwork: this.$store.state.users.currentUser.hide_network,
followList: null,
followImportError: false,
followsImported: false,
@@ -67,8 +66,7 @@ const UserSettings = {
/* eslint-disable camelcase */
const default_scope = this.newDefaultScope
const no_rich_text = this.newNoRichText
- const hide_followings = this.hideFollowings
- const hide_followers = this.hideFollowers
+ const hide_network = this.newHideNetwork
/* eslint-enable camelcase */
this.$store.state.api.backendInteractor
.updateProfile({
@@ -80,8 +78,7 @@ const UserSettings = {
/* eslint-disable camelcase */
default_scope,
no_rich_text,
- hide_followings,
- hide_followers
+ hide_network
/* eslint-enable camelcase */
}}).then((user) => {
if (!user.error) {
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 2a5af99c..be42cc4a 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -30,17 +30,14 @@
<label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
</p>
<p>
- <input type="checkbox" v-model="hideFollowings" id="account-hide-followings">
- <label for="account-hide-followings">{{$t('settings.hide_followings_description')}}</label>
- </p>
- <p>
- <input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
- <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
+ <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
+ <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
</p>
<button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
</div>
<div class="setting-item">
<h2>{{$t('settings.avatar')}}</h2>
+ <p class="visibility-notice">{{$t('settings.avatar_size_instruction')}}</p>
<p>{{$t('settings.current_avatar')}}</p>
<img :src="user.profile_image_url_original" class="old-avatar"></img>
<p>{{$t('settings.set_new_avatar')}}</p>
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 82860e9e..c87371e6 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -155,8 +155,7 @@
"notification_visibility_mentions": "Erwähnungen",
"notification_visibility_repeats": "Wiederholungen",
"no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
- "hide_followings_description": "Zeige nicht, wem ich folge",
- "hide_followers_description": "Zeige nicht, wer mir folgt",
+ "hide_network_description": "Zeige nicht, wem ich folge und wer mir folgt",
"nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
"panelRadius": "Panel",
"pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b1356aaa..29ac2b9a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -118,6 +118,7 @@
"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",
@@ -150,7 +151,7 @@
"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\")",
- "play_videos_inline": "Play videos directly on timeline",
+ "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",
@@ -161,8 +162,7 @@
"notification_visibility_mentions": "Mentions",
"notification_visibility_repeats": "Repeats",
"no_rich_text_description": "Strip rich text formatting from all posts",
- "hide_followings_description": "Don't show who I'm following",
- "hide_followers_description": "Don't show who's following me",
+ "hide_network_description": "Don't show who I'm following and who's following me",
"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
"panelRadius": "Panels",
"pause_on_unfocused": "Pause streaming when tab is not focused",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 122016b0..0d62f295 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -150,7 +150,7 @@
"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_inline": "Toista videot suoraan aikajanalla",
+ "play_videos_in_modal": "Toista videot modaalissa",
"use_contain_fit": "Älä rajaa liitteitä esikatselussa",
"name": "Nimi",
"name_bio": "Nimi ja kuvaus",
diff --git a/src/i18n/ja.json b/src/i18n/ja.json
index 37e96f6c..161856f0 100644
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@@ -157,8 +157,7 @@
"notification_visibility_mentions": "メンション",
"notification_visibility_repeats": "リピート",
"no_rich_text_description": "リッチテキストをつかわない",
- "hide_followings_description": "フォローしている人を表示しない",
- "hide_followers_description": "フォローしている人を表示しない",
+ "hide_network_description": "わたしがフォローしているひとと、わたしをフォローしているひとを、みせない",
"nsfw_clickthrough": "NSFWなファイルをかくす",
"panelRadius": "パネル",
"pause_on_unfocused": "タブにフォーカスがないときストリーミングをとめる",
diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 9f40be51..4b69df07 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -156,8 +156,7 @@
"notification_visibility_mentions": "멘션",
"notification_visibility_repeats": "반복",
"no_rich_text_description": "모든 게시물의 서식을 지우기",
- "hide_followings_description": "내가 팔로우하는 사람을 표시하지 않음",
- "hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
+ "hide_network_description": "내 팔로우와 팔로워를 숨기기",
"nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
"panelRadius": "패널",
"pause_on_unfocused": "탭이 활성 상태가 아닐 때 스트리밍 멈추기",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index bf1e319f..0887bb59 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -127,8 +127,7 @@
"notification_visibility_mentions": "Упоминания",
"notification_visibility_repeats": "Повторы",
"no_rich_text_description": "Убрать форматирование из всех постов",
- "hide_followings_description": "Не показывать кого я читаю",
- "hide_followers_description": "Не показывать кто читает меня",
+ "hide_network_description": "Не показывать кого я читаю и кто меня читает",
"nsfw_clickthrough": "Включить скрытие NSFW вложений",
"panelRadius": "Панели",
"pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 31b48cb6..5b0d8650 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => {
// description
const updateProfile = ({credentials, params}) => {
// Always include these fields, because they might be empty or false
- const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers']
+ const fields = ['description', 'locked', 'no_rich_text', 'hide_network']
let url = PROFILE_UPDATE_URL
const form = new FormData()
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index fa955ad6..74422a49 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -100,8 +100,7 @@ export const parseUser = (data) => {
output.rights = data.rights
output.no_rich_text = data.no_rich_text
output.default_scope = data.default_scope
- output.hide_followings = data.hide_followings
- output.hide_followers = data.hide_followers
+ output.hide_network = data.hide_network
output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship"
output.following = data.following
@@ -268,7 +267,7 @@ export const parseNotification = (data) => {
}
output.created_at = new Date(data.created_at)
- output.id = String(data.id)
+ output.id = data.id
return output
}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 14:15:05 +0000