diff --git a/Cargo.toml b/Cargo.toml index 3e4da59280..966c02830a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -240,6 +240,7 @@ bool_to_int_with_if = "warn" borrow_as_ptr = "warn" cfg_not_test = "warn" clear_with_drain = "warn" +type_complexity = "allow" cloned_instead_of_copied = "warn" collection_is_never_read = "warn" dbg_macro = "warn" diff --git a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue index 44a50f083d..33a7dbf92e 100644 --- a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue +++ b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue @@ -24,7 +24,7 @@
- diff --git a/apps/frontend/src/components/ui/thread/ThreadView.vue b/apps/frontend/src/components/ui/thread/ThreadView.vue index a753014aac..0e487bc68d 100644 --- a/apps/frontend/src/components/ui/thread/ThreadView.vue +++ b/apps/frontend/src/components/ui/thread/ThreadView.vue @@ -59,7 +59,7 @@ - Quick Reply + Quick reply diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts index 1becc8b856..c6ffe9eeec 100644 --- a/apps/frontend/src/composables/featureFlags.ts +++ b/apps/frontend/src/composables/featureFlags.ts @@ -48,7 +48,6 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({ useV1ContentTabAPI: true, labrinthApiCanary: false, dismissedExternalProjectsInfo: false, - modpackPermissionsPage: false, showAllBanners: false, alwaysIgnoreErrorBanner: false, showViewProdRouteBanner: false, diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index 120a9a1ae0..0ec84ff20b 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -3263,9 +3263,6 @@ "project.moderation.thread.help-center-note.2": { "message": "If you need assistance or have additional inquiries, please visit the Modrinth Help Center and click the blue bubble to contact support." }, - "project.moderation.thread.moderator-see-user-ui-toggle": { - "message": "Show member UI" - }, "project.moderation.thread.private-description": { "message": "This is a private conversation thread with the Modrinth moderators. They may message you with issues concerning this project." }, @@ -3336,43 +3333,64 @@ "message": "URL" }, "project.settings.permissions.attention-needed.description.proj-approved": { - "message": "Please provide proof that you have permission to redistribute all of the following files and any withheld versions will be automatically published." + "message": "Please provide proof that you have permission to redistribute all of the following files. Once completed, withheld versions will be automatically published." }, "project.settings.permissions.attention-needed.description.proj-draft": { - "message": "Please provide proof that you have permission to redistribute all of the following files before you can submit your project for review." + "message": "Please provide proof that you have permission to redistribute all of the following files before submitting your project for review." }, "project.settings.permissions.attention-needed.title": { - "message": "Unknown embedded content" + "message": "Unknown external content" + }, + "project.settings.permissions.collapse-all": { + "message": "Collapse all" }, "project.settings.permissions.completed.description": { - "message": "All external content has attributions provided." + "message": "All external content has permission information and attributions have been provided." }, "project.settings.permissions.completed.title": { - "message": "Attributions completed!" + "message": "Permissions completed!" }, "project.settings.permissions.empty-state.description": { - "message": "None of your versions contain external content, so you don't need to worry about obtaining permissions." + "message": "None of your project's versions contain external content, so you don't need to worry about obtaining permissions." }, "project.settings.permissions.empty-state.heading": { "message": "You're all set!" }, + "project.settings.permissions.expand-all": { + "message": "Expand all" + }, "project.settings.permissions.fail.description": { - "message": "You don't have permission to redistribute some of the external content you've added. In order to publish on Modrinth, remove the infringing content." + "message": "You may not have permission to redistribute some of the external content in your project. In order to publish on Modrinth, please remove this content or provide proof that you do have permission to use it." }, "project.settings.permissions.fail.title": { "message": "Some content can't be included" }, "project.settings.permissions.info-banner.description": { - "message": "If you include content that isn’t hosted on Modrinth, you need to let us know where it’s from and verify that you have permission to distribute the files. Check out our guide to learn about how to do this properly!" + "message": "If you include content that isn’t hosted on Modrinth, you need to let us know where it’s from and verify that you have permission to distribute the files. Check out our guide to learn more and get started!" }, "project.settings.permissions.info-banner.title": { - "message": "Learn how attributions work" + "message": "Learn about distribution permissions" }, "project.settings.permissions.learn-more": { "message": "Learn more" }, + "project.settings.permissions.no-results": { + "message": "No external files match your search." + }, "project.settings.permissions.search-placeholder": { - "message": "Search {count} {count, plural, one {external project} other {external projects}}..." + "message": "Search {count} {count, plural, one {project} other {projects}}..." + }, + "project.settings.permissions.sort.most-files": { + "message": "Most files" + }, + "project.settings.permissions.sort.recently-edited": { + "message": "Recently edited" + }, + "project.settings.permissions.sort.rejected": { + "message": "Rejected" + }, + "project.settings.permissions.sort.status": { + "message": "Status" }, "project.settings.title": { "message": "Settings" diff --git a/apps/frontend/src/pages/[type]/[project]/moderation.vue b/apps/frontend/src/pages/[type]/[project]/moderation.vue index 21d8d4d1d2..23fae21ffb 100644 --- a/apps/frontend/src/pages/[type]/[project]/moderation.vue +++ b/apps/frontend/src/pages/[type]/[project]/moderation.vue @@ -72,11 +72,9 @@

{{ formatMessage(messages.threadSectionTitle) }}

-
+
- +