diff --git a/locales/index.d.ts b/locales/index.d.ts
index af5faefe1a..4a46883e9f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -11634,6 +11634,40 @@ export interface Locale extends ILocale {
* Adding entries here will override the default robots.txt packaged with Sharkey.
*/
"robotsTxtDescription": string;
+ /**
+ * Default content warning for new posts
+ */
+ "defaultCW": string;
+ /**
+ * The value here will be auto-filled as the content warning for all new posts and replies.
+ */
+ "defaultCWDescription": string;
+ /**
+ * Automatic CW priority
+ */
+ "defaultCWPriority": string;
+ /**
+ * Select preferred action when default CW and keep CW settings are both enabled at the same time.
+ */
+ "defaultCWPriorityDescription": string;
+ "_defaultCWPriority": {
+ /**
+ * Use Default (use the default CW, ignoring the inherited CW)
+ */
+ "default": string;
+ /**
+ * Use Parent (use the inherited CW, ignoring the default CW)
+ */
+ "parent": string;
+ /**
+ * Use Default, then Parent (use the default CW, and append the inherited CW)
+ */
+ "defaultParent": string;
+ /**
+ * Use Parent, then Default (use the inherited CW, and append the default CW)
+ */
+ "parentDefault": string;
+ };
}
declare const locales: {
[lang: string]: Locale;
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 790f9e44e2..db51506596 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -155,10 +155,24 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._visibility.disableFederation }}
+
+ {{ i18n.ts.keepCw }}
+
+
+ {{ i18n.ts.defaultCW }}
+ {{ i18n.ts.defaultCWDescription }}
+
+
+
+ {{ i18n.ts.defaultCWPriority }}
+ {{ i18n.ts.defaultCWPriorityDescription }}
+
+
+
+
+
-
- {{ i18n.ts.keepCw }}
@@ -193,6 +207,8 @@ const hideOnlineStatus = ref($i.hideOnlineStatus);
const publicReactions = ref($i.publicReactions);
const followingVisibility = ref($i.followingVisibility);
const followersVisibility = ref($i.followersVisibility);
+const defaultCW = ref($i.defaultCW);
+const defaultCWPriority = ref($i.defaultCWPriority);
const defaultNoteVisibility = computed(defaultStore.makeGetterSetter('defaultNoteVisibility'));
const defaultNoteLocalOnly = computed(defaultStore.makeGetterSetter('defaultNoteLocalOnly'));
@@ -251,6 +267,8 @@ function save() {
publicReactions: !!publicReactions.value,
followingVisibility: followingVisibility.value,
followersVisibility: followersVisibility.value,
+ defaultCWPriority: defaultCWPriority.value,
+ defaultCW: defaultCW.value,
});
}
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 8219ccd046..cd3a44407a 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -437,3 +437,13 @@ _permissions:
robotsTxt: "Custom robots.txt"
robotsTxtDescription: "Adding entries here will override the default robots.txt packaged with Sharkey."
+
+defaultCW: "Default content warning for new posts"
+defaultCWDescription: "The value here will be auto-filled as the content warning for all new posts and replies."
+defaultCWPriority: "Automatic CW priority"
+defaultCWPriorityDescription: "Select preferred action when default CW and keep CW settings are both enabled at the same time."
+_defaultCWPriority:
+ default: "Use Default (use the default CW, ignoring the inherited CW)"
+ parent: "Use Parent (use the inherited CW, ignoring the default CW)"
+ defaultParent: "Use Default, then Parent (use the default CW, and append the inherited CW)"
+ parentDefault: "Use Parent, then Default (use the inherited CW, and append the default CW)"