diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue index 2d345ad2bc..92df17f2d9 100644 --- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue +++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue @@ -7,7 +7,14 @@ import { MonitorIcon, WrenchIcon, } from '@modrinth/assets' -import { Avatar, defineMessage, TabbedModal, type TabbedModalTab, useVIntl } from '@modrinth/ui' +import { + Avatar, + commonMessages, + defineMessage, + TabbedModal, + type TabbedModalTab, + useVIntl, +} from '@modrinth/ui' import { convertFileSrc } from '@tauri-apps/api/core' import { ref } from 'vue' @@ -74,11 +81,6 @@ function show() { } defineExpose({ show }) - -const titleMessage = defineMessage({ - id: 'instance.settings.title', - defaultMessage: 'Settings', -}) diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue index 3cf8f8e559..d08f798c4a 100644 --- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue +++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue @@ -9,13 +9,13 @@ @@ -26,6 +26,7 @@ import { CheckIcon, XIcon } from '@modrinth/assets' import { ButtonStyled, + commonMessages, defineMessages, injectNotificationManager, type MessageDescriptor, @@ -81,14 +82,6 @@ const messages = defineMessages({ defaultMessage: "You've been invited to join this project. Please accept or decline the invitation.", }, - accept: { - id: 'project-member-header.accept', - defaultMessage: 'Accept', - }, - decline: { - id: 'project-member-header.decline', - defaultMessage: 'Decline', - }, successJoin: { id: 'project-member-header.success-join', defaultMessage: 'You have joined the project team', @@ -105,14 +98,6 @@ const messages = defineMessages({ id: 'project-member-header.error-decline', defaultMessage: 'Failed to decline team invitation', }, - success: { - id: 'project-member-header.success', - defaultMessage: 'Success', - }, - error: { - id: 'project-member-header.error', - defaultMessage: 'Error', - }, }) const { formatMessage } = useVIntl() @@ -171,13 +156,13 @@ async function acceptInvite(): Promise { await acceptTeamInvite(props.project.team) await handleUpdateMembers() addNotification({ - title: formatMessage(messages.success), + title: formatMessage(commonMessages.successLabel), text: formatMessage(messages.successJoin), type: 'success', }) } catch { addNotification({ - title: formatMessage(messages.error), + title: formatMessage(commonMessages.errorLabel), text: formatMessage(messages.errorJoin), type: 'error', }) @@ -192,13 +177,13 @@ async function declineInvite(): Promise { await removeTeamMember(props.project.team, props.auth.user.id) await handleUpdateMembers() addNotification({ - title: formatMessage(messages.success), + title: formatMessage(commonMessages.successLabel), text: formatMessage(messages.successDecline), type: 'success', }) } catch { addNotification({ - title: formatMessage(messages.error), + title: formatMessage(commonMessages.errorLabel), text: formatMessage(messages.errorDecline), type: 'error', }) diff --git a/apps/frontend/src/components/ui/create/CollectionCreateModal.vue b/apps/frontend/src/components/ui/create/CollectionCreateModal.vue index 06ee080b90..ac3cc27395 100644 --- a/apps/frontend/src/components/ui/create/CollectionCreateModal.vue +++ b/apps/frontend/src/components/ui/create/CollectionCreateModal.vue @@ -43,7 +43,7 @@ @@ -60,6 +60,7 @@ import { PlusIcon, XIcon } from '@modrinth/assets' import { ButtonStyled, + commonMessages, defineMessages, injectNotificationManager, NewModal, @@ -102,18 +103,10 @@ const messages = defineMessages({ defaultMessage: 'Your new collection will be created as a public collection with {count, plural, =0 {no projects} one {# project} other {# projects}}.', }, - cancel: { - id: 'create.collection.cancel', - defaultMessage: 'Cancel', - }, createCollection: { id: 'create.collection.create-collection', defaultMessage: 'Create collection', }, - errorTitle: { - id: 'create.collection.error-title', - defaultMessage: 'An error occurred', - }, }) const name = ref('') @@ -150,7 +143,7 @@ async function create() { await router.push(`/collection/${result.id}`) } catch (err) { addNotification({ - title: formatMessage(messages.errorTitle), + title: formatMessage(commonMessages.errorNotificationTitle), text: err?.data?.description || err?.message || err, type: 'error', }) diff --git a/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue b/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue index d80e05633d..9f208c628f 100644 --- a/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue +++ b/apps/frontend/src/components/ui/create/OrganizationCreateModal.vue @@ -65,7 +65,7 @@ @@ -83,6 +83,7 @@ import { PlusIcon, XIcon } from '@modrinth/assets' import { ButtonStyled, + commonMessages, defineMessages, injectNotificationManager, NewModal, @@ -130,18 +131,10 @@ const messages = defineMessages({ defaultMessage: 'You will be the owner of this organization, but you can invite other members and transfer ownership at any time.', }, - cancel: { - id: 'create.organization.cancel', - defaultMessage: 'Cancel', - }, createOrganization: { id: 'create.organization.create-organization', defaultMessage: 'Create organization', }, - errorTitle: { - id: 'create.organization.error-title', - defaultMessage: 'An error occurred', - }, }) const name = ref('') @@ -172,7 +165,7 @@ async function createOrganization(): Promise { } catch (err: any) { console.error(err) addNotification({ - title: formatMessage(messages.errorTitle), + title: formatMessage(commonMessages.errorNotificationTitle), text: err.data ? err.data.description : err, type: 'error', }) diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue index fe9e6ea76f..b3b355e2c7 100644 --- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue +++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue @@ -43,7 +43,7 @@
@@ -60,7 +60,7 @@
@@ -601,26 +601,10 @@ const messages = defineMessages({ id: 'dashboard.creator-withdraw-modal.stage.method-selection', defaultMessage: 'Method', }, - tremendousDetailsStage: { - id: 'dashboard.creator-withdraw-modal.stage.tremendous-details', - defaultMessage: 'Details', - }, - muralpayKycStage: { - id: 'dashboard.creator-withdraw-modal.stage.muralpay-kyc', - defaultMessage: 'Verification', - }, - muralpayDetailsStage: { - id: 'dashboard.creator-withdraw-modal.stage.muralpay-details', - defaultMessage: 'Account Details', - }, completionStage: { id: 'dashboard.creator-withdraw-modal.stage.completion', defaultMessage: 'Complete', }, - detailsLabel: { - id: 'dashboard.creator-withdraw-modal.details-label', - defaultMessage: 'Details', - }, completeTaxForm: { id: 'dashboard.creator-withdraw-modal.complete-tax-form', defaultMessage: 'Complete tax form', @@ -633,10 +617,6 @@ const messages = defineMessages({ id: 'dashboard.creator-withdraw-modal.withdraw-button', defaultMessage: 'Withdraw', }, - closeButton: { - id: 'dashboard.withdraw.completion.close-button', - defaultMessage: 'Close', - }, transactionsButton: { id: 'dashboard.withdraw.completion.transactions-button', defaultMessage: 'Transactions', diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue index f27f580608..ebe18d782b 100644 --- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue +++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue @@ -287,13 +287,5 @@ const messages = defineMessages({ defaultMessage: "You'll receive an email at {email} with instructions to redeem your withdrawal.", }, - closeButton: { - id: 'dashboard.withdraw.completion.close-button', - defaultMessage: 'Close', - }, - transactionsButton: { - id: 'dashboard.withdraw.completion.transactions-button', - defaultMessage: 'Transactions', - }, }) diff --git a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue index 6fa44b0ae5..d175f15aa5 100644 --- a/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue +++ b/apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue @@ -57,8 +57,8 @@ {{ venmoSaveSuccess - ? formatMessage(messages.savedButton) - : formatMessage(messages.saveButton) + ? formatMessage(commonMessages.savedLabel) + : formatMessage(commonMessages.saveButton) }} @@ -107,6 +107,7 @@ import { CheckIcon, PayPalColorIcon, SaveIcon, XIcon } from '@modrinth/assets' import { ButtonStyled, Checkbox, + commonMessages, defineMessages, financialMessages, formFieldLabels, @@ -342,14 +343,6 @@ const messages = defineMessages({ id: 'dashboard.creator-withdraw-modal.paypal-details.disconnect-account', defaultMessage: 'Disconnect account', }, - saveButton: { - id: 'dashboard.creator-withdraw-modal.paypal-details.save-button', - defaultMessage: 'Save', - }, - savedButton: { - id: 'dashboard.creator-withdraw-modal.paypal-details.saved-button', - defaultMessage: 'Saved', - }, saveSuccess: { id: 'dashboard.creator-withdraw-modal.paypal-details.save-success', defaultMessage: 'Venmo handle saved successfully!', diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue index 4b3d9ecb98..d016f59863 100644 --- a/apps/frontend/src/layouts/default.vue +++ b/apps/frontend/src/layouts/default.vue @@ -460,7 +460,7 @@