aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/tabs/general_tab.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2022-02-03 19:37:13 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2022-02-03 19:37:13 +0000
commit8ade11783aa4740a2cff61f27938f3408c3e0eb0 (patch)
tree0e61058d7c82e9aa225c32b36d460a6e24acd03e /src/components/settings_modal/tabs/general_tab.js
parenta5e20a4eb25864889dbc7dff1a6a9ad2cb98735b (diff)
parentc3f1765b21f0312347ad8f1e514d5bc534121fcc (diff)
Merge branch 'from/develop/tusooa/1118-enhanced-mention-link' into 'develop'
Enhanced mention link Closes #1118 See merge request pleroma/pleroma-fe!1424
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.js')
-rw-r--r--src/components/settings_modal/tabs/general_tab.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index eeda61bf..952c328d 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -20,6 +20,11 @@ const GeneralTab = {
value: mode,
label: this.$t(`settings.subject_line_${mode === 'masto' ? 'mastodon' : mode}`)
})),
+ mentionLinkDisplayOptions: ['short', 'full_for_remote', 'full'].map(mode => ({
+ key: mode,
+ value: mode,
+ label: this.$t(`settings.mention_link_display_${mode}`)
+ })),
loopSilentAvailable:
// Firefox
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||