From 0ca13caa9f187b0fd39adbb64dee62e114fe2421 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 6 Sep 2022 17:49:50 +0100 Subject: [PATCH 1/3] collapse CW'd posts by default Fixes #129 --- src/modules/config.js | 2 +- src/modules/instance.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/config.js b/src/modules/config.js index 94b52e92..e0530101 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -34,7 +34,7 @@ export const defaultState = { hideThreadsWithBlockedUsers: undefined, // instance default hideWordFilteredPosts: undefined, // instance default muteBotStatuses: undefined, // instance default - collapseMessageWithSubject: undefined, // instance default + collapseMessageWithSubject: true, // instance default padEmoji: true, showNavShortcuts: undefined, // instance default showPanelNavShortcuts: undefined, // instance default diff --git a/src/modules/instance.js b/src/modules/instance.js index f9118e16..5ab34f85 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -17,7 +17,7 @@ const defaultState = { defaultAvatar: '/images/avi.png', defaultBanner: '/images/banner.png', background: '/static/aurora_borealis.jpg', - collapseMessageWithSubject: false, + collapseMessageWithSubject: true, greentext: false, useAtIcon: false, mentionLinkDisplay: 'short', -- 2.43.0 From 571014d65474c86549f8af8e3d400ff7e793e90b Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 6 Sep 2022 17:55:52 +0100 Subject: [PATCH 2/3] change to reference CW --- src/i18n/en.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/en.json b/src/i18n/en.json index 70f0bacf..401128d0 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -279,7 +279,7 @@ "text/plain": "Plain text", "text/x.misskeymarkdown": "MFM" }, - "content_warning": "Subject (optional)", + "content_warning": "Content Warning (optional)", "default": "Just arrived at Luna Nova Academy", "direct_warning_to_all": "This post will be visible to all the mentioned users.", "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.", @@ -777,9 +777,9 @@ "use_source": "New version" } }, - "subject_input_always_show": "Always show subject field", - "subject_line_behavior": "Copy subject when replying", - "subject_line_email": "Like email: \"re: subject\"", + "subject_input_always_show": "Always show content warning field", + "subject_line_behavior": "Copy content warning when replying", + "subject_line_email": "Like email: \"re: warning\"", "subject_line_mastodon": "Like mastodon: copy as is", "subject_line_noop": "Do not copy", "text": "Text", @@ -838,7 +838,7 @@ "favorites": "Favorites", "hide_attachment": "Hide attachment", "hide_content": "Hide content", - "hide_full_subject": "Hide full subject", + "hide_full_subject": "Hide full content warning", "many_attachments": "Post has {number} attachment | Post has {number} attachments", "mentions": "Mentions", "move_down": "Shift attachment right", @@ -865,7 +865,7 @@ "show_attachment_description": "Preview description (open attachment for full description)", "show_attachment_in_modal": "Show attachment in a window", "show_content": "Show content", - "show_full_subject": "Show full subject", + "show_full_subject": "Show full content warning", "show_only_conversation_under_this": "Only show replies to this post", "status_deleted": "This post was deleted", "status_unavailable": "Post unavailable", -- 2.43.0 From b8482d2a6aa332f638fadc0aa9e205517030cb32 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Tue, 6 Sep 2022 17:56:26 +0100 Subject: [PATCH 3/3] fix remaining source strings --- src/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en.json b/src/i18n/en.json index 401128d0..49c45014 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -392,7 +392,7 @@ "changed_password": "Password changed successfully!", "chatMessageRadius": "Chat message", "checkboxRadius": "Checkboxes", - "collapse_subject": "Collapse posts with subjects", + "collapse_subject": "Collapse posts with content warnings", "columns": "Columns", "composing": "Composing", "confirm_dialogs": "Require confirmation for:", @@ -614,7 +614,7 @@ "security": "Security", "security_tab": "Security", "sensitive_by_default": "Mark posts as sensitive by default", - "sensitive_if_subject": "Automatically mark images as sensitive if a subject line is specified", + "sensitive_if_subject": "Automatically mark images as sensitive if a content warning is specified", "set_new_avatar": "Set new avatar", "set_new_mascot": "Set new mascot", "set_new_profile_background": "Set new profile background", -- 2.43.0