diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/settings/settings.js | 12 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 35 | ||||
| -rw-r--r-- | src/i18n/en.json | 7 | ||||
| -rw-r--r-- | src/i18n/fr.json | 1 | ||||
| -rw-r--r-- | src/modules/config.js | 6 | ||||
| -rw-r--r-- | src/modules/instance.js | 2 |
6 files changed, 61 insertions, 2 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index a24bc265..a7c2c565 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -26,6 +26,12 @@ const settings = { ? instance.collapseMessageWithSubject : user.collapseMessageWithSubject, collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject), + subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined' + ? instance.subjectLineBehavior + : user.subjectLineBehavior, + subjectLineBehaviorDefault: instance.subjectLineBehavior, + scopeCopyLocal: user.scopeCopy, + scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy), stopGifs: user.stopGifs, loopSilentAvailable: // Firefox @@ -99,6 +105,12 @@ const settings = { collapseMessageWithSubjectLocal (value) { this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value }) }, + scopeCopyLocal (value) { + this.$store.dispatch('setOption', { name: 'scopeCopy', value }) + }, + subjectLineBehaviorLocal (value) { + this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value }) + }, stopGifs (value) { this.$store.dispatch('setOption', { name: 'stopGifs', value }) } diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 42c660a3..f9e7d711 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -53,6 +53,41 @@ </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> + <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')}} + {{subjectLineBehaviorLocal == 'email' ? $t('settings.instance_default_simple') : ''}} + </option> + <option value="masto"> + {{$t('settings.subject_line_mastodon')}} + {{subjectLineBehaviorLocal == 'mastodon' ? $t('settings.instance_default_simple') : ''}} + </option> + <option value="noop"> + {{$t('settings.subject_line_noop')}} + {{subjectLineBehaviorLocal == 'noop' ? $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"> diff --git a/src/i18n/en.json b/src/i18n/en.json index 2dc6493e..cd87240b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -88,6 +88,7 @@ "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", @@ -115,6 +116,7 @@ "import_theme": "Load preset", "inputRadius": "Input fields", "instance_default: (default": "{value})", + "instance_default_simple" : "(default)", "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", @@ -147,10 +149,15 @@ "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_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", "stop_gifs": "Play-on-hover GIFs", "streaming": "Enable automatic streaming of new posts when scrolled to the top", "text": "Text", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index cf45d9af..b76db32a 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -115,6 +115,7 @@ "import_theme": "Charger le thème", "inputRadius": "Champs de texte", "instance_default: (default": "{value})", + "instance_default_simple" : "(default)", "interfaceLanguage": "Langue de l'interface", "invalid_theme_imported": "Le fichier sélectionné n'est pas un thème Pleroma pris en charge. Aucun changement n'a été apporté à votre thème.", "limited_availability": "Non disponible dans votre navigateur", diff --git a/src/modules/config.js b/src/modules/config.js index 375d0167..0d36e9bf 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -5,7 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] const defaultState = { colors: {}, - collapseMessageWithSubject: false, + collapseMessageWithSubject: undefined, // instance default hideAttachments: false, hideAttachmentsInConv: false, hideNsfw: true, @@ -25,7 +25,9 @@ const defaultState = { }, muteWords: [], highlight: {}, - interfaceLanguage: browserLocale + interfaceLanguage: browserLocale, + scopeCopy: undefined, // instance default + subjectLineBehavior: undefined // instance default } const config = { diff --git a/src/modules/instance.js b/src/modules/instance.js index cb724821..0e67e4d1 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -19,6 +19,8 @@ const defaultState = { formattingOptionsEnabled: false, collapseMessageWithSubject: false, disableChat: false, + scopeCopy: false, + subjectLineBehavior: 'email', // Nasty stuff pleromaBackend: true, |