1
0
mirror of https://git.boykissers.com/pawkey/pawkey-sk.git synced 2025-12-20 04:04:16 +00:00

Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot
2025-02-07 11:54:29 -05:00
24 changed files with 512 additions and 35 deletions

34
locales/index.d.ts vendored
View File

@@ -11977,6 +11977,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;
};
/**
* ID
*/