MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deduplicate common strings in translation (#5085)

Browse Source 
* deduplicate common strings, part 1

* deduplicate common strings, part 2

* typo and general import mess fixes

* detail common string

* fix lint

* fix lint TWO

* adress review concerns + lint

* app lint too

* actually leave privateLabel untouched

* lint fix THREE

* fix: broken msg

* fix: lint

---------

Co-authored-by: Calum H. <contact@cal.engineer>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
This commit is contained in:
lumiscosity
2026-01-28 19:10:50 +01:00
committed by GitHub
parent 400c571fe6
commit 6d68d50699
31 changed files with 279 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/frontend/src/components/ui/ProjectMemberHeader.vue
View File

@@ -9,13 +9,13 @@
<ButtonStyled color="brand">
<button class="brand-button" @click="acceptInvite()">
<CheckIcon />
{{ getFormattedMessage(messages.accept) }}
{{ getFormattedMessage(commonMessages.acceptButton) }}
</button>
</ButtonStyled>
<ButtonStyled color="red">
<button @click="declineInvite">
<XIcon />
{{ getFormattedMessage(messages.decline) }}
{{ getFormattedMessage(commonMessages.declineButton) }}
</button>
</ButtonStyled>
</div>
@@ -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<void> {
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<void> {
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',
})

13
apps/frontend/src/components/ui/create/CollectionCreateModal.vue
View File

@@ -43,7 +43,7 @@
<ButtonStyled class="w-24">
<button @click="modal.hide()">
<XIcon aria-hidden="true" />
{{ formatMessage(messages.cancel) }}
{{ formatMessage(commonMessages.cancelButton) }}
</button>
</ButtonStyled>
<ButtonStyled color="brand" class="w-36">
@@ -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',
})

13
apps/frontend/src/components/ui/create/OrganizationCreateModal.vue
View File

@@ -65,7 +65,7 @@
<ButtonStyled class="w-24">
<button @click="hide">
<XIcon aria-hidden="true" />
{{ formatMessage(messages.cancel) }}
{{ formatMessage(commonMessages.cancelButton) }}
</button>
</ButtonStyled>
<ButtonStyled color="brand" class="w-40">
@@ -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<string>('')
@@ -172,7 +165,7 @@ async function createOrganization(): Promise<void> {
} catch (err: any) {
console.error(err)
addNotification({
title: formatMessage(messages.errorTitle),
title: formatMessage(commonMessages.errorNotificationTitle),
text: err.data ? err.data.description : err,
type: 'error',
})

19
apps/frontend/src/components/ui/create/ProjectCreateModal.vue
View File

@@ -43,7 +43,7 @@
<div class="flex flex-col gap-2">
<label for="visibility" class="flex flex-col gap-1">
<span class="text-lg font-semibold text-contrast">
{{ formatMessage(messages.visibilityLabel) }}
{{ formatMessage(commonMessages.visibilityLabel) }}
<span class="text-brand-red">*</span>
</span>
<span>{{ formatMessage(messages.visibilityDescription) }}</span>
@@ -79,7 +79,7 @@
<ButtonStyled class="w-24">
<button @click="cancel">
<XIcon aria-hidden="true" />
{{ formatMessage(messages.cancel) }}
{{ formatMessage(commonMessages.cancelButton) }}
</button>
</ButtonStyled>
<ButtonStyled color="brand" class="w-32">
@@ -98,6 +98,7 @@ import { PlusIcon, XIcon } from '@modrinth/assets'
import {
ButtonStyled,
Chips,
commonMessages,
defineMessages,
injectNotificationManager,
NewModal,
@@ -127,10 +128,6 @@ const messages = defineMessages({
id: 'create.project.url-label',
defaultMessage: 'URL',
},
visibilityLabel: {
id: 'create.project.visibility-label',
defaultMessage: 'Visibility',
},
visibilityDescription: {
id: 'create.project.visibility-description',
defaultMessage: 'The visibility of your project after it has been approved.',
@@ -147,18 +144,10 @@ const messages = defineMessages({
id: 'create.project.summary-placeholder',
defaultMessage: 'This project adds...',
},
cancel: {
id: 'create.project.cancel',
defaultMessage: 'Cancel',
},
createProject: {
id: 'create.project.create-project',
defaultMessage: 'Create project',
},
errorTitle: {
id: 'create.project.error-title',
defaultMessage: 'An error occurred',
},
visibilityPublic: {
id: 'create.project.visibility-public',
defaultMessage: 'Public',
@@ -256,7 +245,7 @@ async function createProject() {
await router.push(`/project/${slug.value}/settings`)
} catch (err) {
addNotification({
title: formatMessage(messages.errorTitle),
title: formatMessage(commonMessages.errorNotificationTitle),
text: err.data ? err.data.description : err,
type: 'error',
})

8
apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue
View File

@@ -37,7 +37,10 @@
v-model="isUSCitizen"
:items="['yes', 'no']"
:format-label="
(item) => (item === 'yes' ? formatMessage(messages.yes) : formatMessage(messages.no))
(item) =>
item === 'yes'
? formatMessage(commonMessages.yesLabel)
: formatMessage(commonMessages.noLabel)
"
:never-empty="false"
:capitalize="true"
@@ -162,6 +165,7 @@ import {
Admonition,
ButtonStyled,
Chips,
commonMessages,
defineMessages,
injectNotificationManager,
IntlFormatted,
@@ -228,8 +232,6 @@ const messages = defineMessages({
id: 'dashboard.creator-tax-form-modal.us-citizen.question',
defaultMessage: 'Are you a US citizen?',
},
yes: { id: 'common.yes', defaultMessage: 'Yes' },
no: { id: 'common.no', defaultMessage: 'No' },
entityQuestion: {
id: 'dashboard.creator-tax-form-modal.entity.question',
defaultMessage: 'Are you a private individual or part of a foreign entity?',

26
apps/frontend/src/components/ui/dashboard/CreatorWithdrawModal.vue
View File

@@ -60,7 +60,7 @@
<div v-if="currentStage === 'completion'" class="mt-4 flex w-full gap-3">
<ButtonStyled class="flex-1">
<button class="w-full text-contrast" @click="handleClose">
{{ formatMessage(messages.closeButton) }}
{{ formatMessage(commonMessages.closeButton) }}
</button>
</ButtonStyled>
<ButtonStyled class="flex-1">
@@ -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',
@@ -629,14 +613,14 @@ const messages = defineMessages({
id: 'dashboard.creator-withdraw-modal.continue-with-limit',
defaultMessage: 'Continue with limit',
},
detailsLabel: {
id: 'dashboard.creator-withdraw-modal.details-label',
defaultMessage: 'Details',
},
withdrawButton: {
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',

8
apps/frontend/src/components/ui/dashboard/withdraw-stages/CompletionStage.vue
View File

@@ -287,13 +287,5 @@ const messages = defineMessages({
defaultMessage:
"You'll receive an email at <b>{email}</b> with instructions to redeem your withdrawal.",
},
closeButton: {
id: 'dashboard.withdraw.completion.close-button',
defaultMessage: 'Close',
},
transactionsButton: {
id: 'dashboard.withdraw.completion.transactions-button',
defaultMessage: 'Transactions',
},
})
</script>

13
apps/frontend/src/components/ui/dashboard/withdraw-stages/LegacyPaypalDetailsStage.vue
View File

@@ -57,8 +57,8 @@
<SaveIcon v-else />
{{
venmoSaveSuccess
? formatMessage(messages.savedButton)
: formatMessage(messages.saveButton)
? formatMessage(commonMessages.savedLabel)
: formatMessage(commonMessages.saveButton)
}}
</button>
</ButtonStyled>
@@ -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!',

6
apps/frontend/src/layouts/default.vue
View File

@@ -470,7 +470,7 @@
<CurrencyIcon aria-hidden="true" /> {{ formatMessage(messages.revenue) }}
</template>
<template #analytics>
<ChartIcon aria-hidden="true" /> {{ formatMessage(messages.analytics) }}
<ChartIcon aria-hidden="true" /> {{ formatMessage(commonMessages.analyticsButton) }}
</template>
<template #moderation>
<ScaleIcon aria-hidden="true" /> {{ formatMessage(commonMessages.moderationLabel) }}
@@ -899,10 +899,6 @@ const messages = defineMessages({
id: 'layout.nav.revenue',
defaultMessage: 'Revenue',
},
analytics: {
id: 'layout.nav.analytics',
defaultMessage: 'Analytics',
},
activeReports: {
id: 'layout.nav.active-reports',
defaultMessage: 'Active reports',

165
apps/frontend/src/locales/en-US/index.json
View File

@@ -230,12 +230,6 @@
"auth.reset-password.method-choice.description": {
"message": "Enter your email below and we'll send a recovery link to allow you to recover your account."
},
"auth.reset-password.method-choice.email-username.label": {
"message": "Email or username"
},
"auth.reset-password.method-choice.email-username.placeholder": {
"message": "Email"
},
"auth.reset-password.notification.email-sent.text": {
"message": "An email with instructions has been sent to you if the email was previously saved on your account."
},
@@ -275,12 +269,6 @@
"auth.sign-in.additional-options": {
"message": "<forgot-password-link>Forgot password?</forgot-password-link> • <create-account-link>Create an account</create-account-link>"
},
"auth.sign-in.email-username.label": {
"message": "Email or username"
},
"auth.sign-in.password.label": {
"message": "Password"
},
"auth.sign-in.sign-in-with": {
"message": "Sign in with"
},
@@ -293,24 +281,12 @@
"auth.sign-up.action.create-account": {
"message": "Create account"
},
"auth.sign-up.confirm-password.label": {
"message": "Confirm password"
},
"auth.sign-up.email.label": {
"message": "Email"
},
"auth.sign-up.label.username": {
"message": "Username"
},
"auth.sign-up.legal-dislaimer": {
"message": "By creating an account, you agree to Modrinth's <terms-link>Terms</terms-link> and <privacy-policy-link>Privacy Policy</privacy-policy-link>."
},
"auth.sign-up.notification.password-mismatch.text": {
"message": "Passwords do not match!"
},
"auth.sign-up.password.label": {
"message": "Password"
},
"auth.sign-up.sign-in-option.title": {
"message": "Already have an account?"
},
@@ -329,9 +305,6 @@
"auth.verify-email.action.account-settings": {
"message": "Account settings"
},
"auth.verify-email.action.sign-in": {
"message": "Sign in"
},
"auth.verify-email.already-verified.description": {
"message": "Your email is already verified!"
},
@@ -416,12 +389,6 @@
"collection.label.curated-by": {
"message": "Curated by"
},
"collection.label.description": {
"message": "Description"
},
"collection.label.details": {
"message": "Details"
},
"collection.label.no-projects": {
"message": "No projects in collection yet"
},
@@ -440,27 +407,15 @@
"collection.title": {
"message": "{name} - Collection"
},
"common.no": {
"message": "No"
},
"common.yes": {
"message": "Yes"
},
"create-project-version.create-modal.stage.add-files.admonition": {
"message": "Supplementary files are for supporting resources like source code, not for alternative versions or variants."
},
"create.collection.cancel": {
"message": "Cancel"
},
"create.collection.collection-info": {
"message": "Your new collection will be created as a public collection with {count, plural, =0 {no projects} one {# project} other {# projects}}."
},
"create.collection.create-collection": {
"message": "Create collection"
},
"create.collection.error-title": {
"message": "An error occurred"
},
"create.collection.name-label": {
"message": "Name"
},
@@ -512,15 +467,9 @@
"create.limit-alert.type-project": {
"message": "project"
},
"create.organization.cancel": {
"message": "Cancel"
},
"create.organization.create-organization": {
"message": "Create organization"
},
"create.organization.error-title": {
"message": "An error occurred"
},
"create.organization.name-label": {
"message": "Name"
},
@@ -545,15 +494,9 @@
"create.organization.url-label": {
"message": "URL"
},
"create.project.cancel": {
"message": "Cancel"
},
"create.project.create-project": {
"message": "Create project"
},
"create.project.error-title": {
"message": "An error occurred"
},
"create.project.name-label": {
"message": "Name"
},
@@ -578,9 +521,6 @@
"create.project.visibility-description": {
"message": "The visibility of your project after it has been approved."
},
"create.project.visibility-label": {
"message": "Visibility"
},
"create.project.visibility-private": {
"message": "Private"
},
@@ -788,15 +728,9 @@
"dashboard.creator-withdraw-modal.paypal-details.paypal-auth-description": {
"message": "Connect your PayPal account to receive payments directly."
},
"dashboard.creator-withdraw-modal.paypal-details.save-button": {
"message": "Save"
},
"dashboard.creator-withdraw-modal.paypal-details.save-success": {
"message": "Venmo handle saved successfully!"
},
"dashboard.creator-withdraw-modal.paypal-details.saved-button": {
"message": "Saved"
},
"dashboard.creator-withdraw-modal.paypal-details.sign-in-with-paypal": {
"message": "Sign in with PayPal"
},
@@ -815,18 +749,9 @@
"dashboard.creator-withdraw-modal.stage.method-selection": {
"message": "Method"
},
"dashboard.creator-withdraw-modal.stage.muralpay-details": {
"message": "Account Details"
},
"dashboard.creator-withdraw-modal.stage.muralpay-kyc": {
"message": "Verification"
},
"dashboard.creator-withdraw-modal.stage.tax-form": {
"message": "Tax form"
},
"dashboard.creator-withdraw-modal.stage.tremendous-details": {
"message": "Details"
},
"dashboard.creator-withdraw-modal.tax-form-required.body": {
"message": "To withdraw your full <b>{available}</b> available balance please complete the form below. It is required for tax reporting and only needs to be done once."
},
@@ -956,9 +881,6 @@
"dashboard.withdraw.completion.amount": {
"message": "Amount"
},
"dashboard.withdraw.completion.close-button": {
"message": "Close"
},
"dashboard.withdraw.completion.date": {
"message": "Date"
},
@@ -1469,15 +1391,6 @@
"landing.notifications.version-released": {
"message": "Version {version} has been released for {gameVersion}"
},
"landing.search.label": {
"message": "Search"
},
"landing.search.placeholder": {
"message": "Search..."
},
"landing.search.sort-by.label": {
"message": "Sort by"
},
"landing.section.for-creators.description": {
"message": "Give an online home to your creations and reach a massive audience of dedicated players."
},
@@ -1703,9 +1616,6 @@
"layout.nav.active-reports": {
"message": "Active reports"
},
"layout.nav.analytics": {
"message": "Analytics"
},
"layout.nav.discover": {
"message": "Discover"
},
@@ -1754,9 +1664,6 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Upgrade to Modrinth+"
},
"moderation.filter.by": {
"message": "Filter by"
},
"moderation.moderate": {
"message": "Moderate"
},
@@ -1769,12 +1676,6 @@
"moderation.page.technicalReview": {
"message": "Technical Review"
},
"moderation.search.placeholder": {
"message": "Search..."
},
"moderation.sort.by": {
"message": "Sort by"
},
"muralpay.account-type.checking": {
"message": "Checking"
},
@@ -2102,18 +2003,12 @@
"profile.label.collection": {
"message": "Collection"
},
"profile.label.details": {
"message": "Details"
},
"profile.label.downloads": {
"message": "{count} {count, plural, one {download} other {downloads}}"
},
"profile.label.joined": {
"message": "Joined"
},
"profile.label.no": {
"message": "No"
},
"profile.label.no-collections": {
"message": "This user has no collections!"
},
@@ -2135,9 +2030,6 @@
"profile.label.saving": {
"message": "Saving..."
},
"profile.label.yes": {
"message": "Yes"
},
"profile.meta.description": {
"message": "Download {username}'s projects on Modrinth"
},
@@ -2150,15 +2042,6 @@
"profile.user-id": {
"message": "User ID: {id}"
},
"project-member-header.accept": {
"message": "Accept"
},
"project-member-header.decline": {
"message": "Decline"
},
"project-member-header.error": {
"message": "Error"
},
"project-member-header.error-decline": {
"message": "Failed to decline team invitation"
},
@@ -2174,9 +2057,6 @@
"project-member-header.invitation-with-role": {
"message": "You've been invited to be a member of this project with the role of ''{role}''."
},
"project-member-header.success": {
"message": "Success"
},
"project-member-header.success-decline": {
"message": "You have declined the team invitation"
},
@@ -2891,9 +2771,6 @@
"settings.billing.payment_method.action.primary": {
"message": "Make primary"
},
"settings.billing.payment_method.card_display": {
"message": "{card_brand} ending in {last_four}"
},
"settings.billing.payment_method.card_expiry": {
"message": "Expires {month}/{year}"
},
@@ -2906,42 +2783,6 @@
"settings.billing.payment_method.title": {
"message": "Payment methods"
},
"settings.billing.payment_method_type.amazon_pay": {
"message": "Amazon Pay"
},
"settings.billing.payment_method_type.amex": {
"message": "American Express"
},
"settings.billing.payment_method_type.cashapp": {
"message": "Cash App"
},
"settings.billing.payment_method_type.diners": {
"message": "Diners Club"
},
"settings.billing.payment_method_type.discover": {
"message": "Discover"
},
"settings.billing.payment_method_type.eftpos": {
"message": "EFTPOS"
},
"settings.billing.payment_method_type.jcb": {
"message": "JCB"
},
"settings.billing.payment_method_type.mastercard": {
"message": "MasterCard"
},
"settings.billing.payment_method_type.paypal": {
"message": "PayPal"
},
"settings.billing.payment_method_type.unionpay": {
"message": "UnionPay"
},
"settings.billing.payment_method_type.unknown": {
"message": "Unknown payment method"
},
"settings.billing.payment_method_type.visa": {
"message": "Visa"
},
"settings.billing.pyro_subscription.description": {
"message": "Manage your Modrinth Server subscriptions."
},
@@ -3095,18 +2936,12 @@
"settings.profile.profile-info": {
"message": "Profile information"
},
"settings.profile.profile-picture.reset": {
"message": "Reset"
},
"settings.profile.profile-picture.title": {
"message": "Profile picture"
},
"settings.profile.username.description": {
"message": "A unique case-insensitive name to identify your profile."
},
"settings.profile.username.title": {
"message": "Username"
},
"settings.sessions.action.revoke-session": {
"message": "Revoke session"
},

12
apps/frontend/src/pages/auth/reset-password.vue
View File

@@ -9,7 +9,7 @@
<div class="iconified-input">
<label for="email" hidden>
{{ formatMessage(methodChoiceMessages.emailUsernameLabel) }}
{{ formatMessage(commonMessages.emailUsernameLabel) }}
</label>
<MailIcon />
<input
@@ -18,7 +18,7 @@
type="text"
autocomplete="username"
class="auth-form__input"
:placeholder="formatMessage(methodChoiceMessages.emailUsernamePlaceholder)"
:placeholder="formatMessage(commonMessages.emailLabel)"
/>
</div>
@@ -81,14 +81,6 @@ const methodChoiceMessages = defineMessages({
defaultMessage:
"Enter your email below and we'll send a recovery link to allow you to recover your account.",
},
emailUsernameLabel: {
id: 'auth.reset-password.method-choice.email-username.label',
defaultMessage: 'Email or username',
},
emailUsernamePlaceholder: {
id: 'auth.reset-password.method-choice.email-username.placeholder',
defaultMessage: 'Email',
},
action: {
id: 'auth.reset-password.method-choice.action',
defaultMessage: 'Send recovery email',

16
apps/frontend/src/pages/auth/sign-in.vue
View File

@@ -63,7 +63,7 @@
<section class="auth-form">
<div class="iconified-input">
<label for="email" hidden>{{ formatMessage(messages.emailUsernameLabel) }}</label>
<label for="email" hidden>{{ formatMessage(commonMessages.emailUsernameLabel) }}</label>
<MailIcon />
<input
id="email"
@@ -72,12 +72,12 @@
inputmode="email"
autocomplete="username"
class="auth-form__input"
:placeholder="formatMessage(messages.emailUsernameLabel)"
:placeholder="formatMessage(commonMessages.emailUsernameLabel)"
/>
</div>
<div class="iconified-input">
<label for="password" hidden>{{ formatMessage(messages.passwordLabel) }}</label>
<label for="password" hidden>{{ formatMessage(commonMessages.passwordLabel) }}</label>
<KeyIcon />
<input
id="password"
@@ -85,7 +85,7 @@
type="password"
autocomplete="current-password"
class="auth-form__input"
:placeholder="formatMessage(messages.passwordLabel)"
:placeholder="formatMessage(commonMessages.passwordLabel)"
/>
</div>
@@ -162,14 +162,6 @@ const messages = defineMessages({
defaultMessage:
'<forgot-password-link>Forgot password?</forgot-password-link> • <create-account-link>Create an account</create-account-link>',
},
emailUsernameLabel: {
id: 'auth.sign-in.email-username.label',
defaultMessage: 'Email or username',
},
passwordLabel: {
id: 'auth.sign-in.password.label',
defaultMessage: 'Password',
},
signInWithLabel: {
id: 'auth.sign-in.sign-in-with',
defaultMessage: 'Sign in with',

34
apps/frontend/src/pages/auth/sign-up.vue
View File

@@ -33,7 +33,7 @@
<section class="auth-form">
<div class="iconified-input">
<label for="email" hidden>{{ formatMessage(messages.emailLabel) }}</label>
<label for="email" hidden>{{ formatMessage(commonMessages.emailLabel) }}</label>
<MailIcon />
<input
id="email"
@@ -41,12 +41,12 @@
type="email"
autocomplete="username"
class="auth-form__input"
:placeholder="formatMessage(messages.emailLabel)"
:placeholder="formatMessage(commonMessages.emailLabel)"
/>
</div>
<div class="iconified-input">
<label for="username" hidden>{{ formatMessage(messages.usernameLabel) }}</label>
<label for="username" hidden>{{ formatMessage(commonMessages.usernameLabel) }}</label>
<UserIcon />
<input
id="username"
@@ -54,12 +54,12 @@
type="text"
autocomplete="username"
class="auth-form__input"
:placeholder="formatMessage(messages.usernameLabel)"
:placeholder="formatMessage(commonMessages.usernameLabel)"
/>
</div>
<div class="iconified-input">
<label for="password" hidden>{{ formatMessage(messages.passwordLabel) }}</label>
<label for="password" hidden>{{ formatMessage(commonMessages.passwordLabel) }}</label>
<KeyIcon />
<input
id="password"
@@ -67,12 +67,14 @@
class="auth-form__input"
type="password"
autocomplete="new-password"
:placeholder="formatMessage(messages.passwordLabel)"
:placeholder="formatMessage(commonMessages.passwordLabel)"
/>
</div>
<div class="iconified-input">
<label for="confirm-password" hidden>{{ formatMessage(messages.passwordLabel) }}</label>
<label for="confirm-password" hidden>{{
formatMessage(commonMessages.passwordLabel)
}}</label>
<KeyIcon />
<input
id="confirm-password"
@@ -80,7 +82,7 @@
type="password"
autocomplete="new-password"
class="auth-form__input"
:placeholder="formatMessage(messages.confirmPasswordLabel)"
:placeholder="formatMessage(commonMessages.confirmPasswordLabel)"
/>
</div>
@@ -173,22 +175,6 @@ const messages = defineMessages({
id: 'auth.sign-up.title.create-account',
defaultMessage: 'Or create an account yourself',
},
emailLabel: {
id: 'auth.sign-up.email.label',
defaultMessage: 'Email',
},
usernameLabel: {
id: 'auth.sign-up.label.username',
defaultMessage: 'Username',
},
passwordLabel: {
id: 'auth.sign-up.password.label',
defaultMessage: 'Password',
},
confirmPasswordLabel: {
id: 'auth.sign-up.confirm-password.label',
defaultMessage: 'Confirm password',
},
subscribeLabel: {
id: 'auth.sign-up.subscribe.label',
defaultMessage: 'Subscribe to updates about Modrinth',

16
apps/frontend/src/pages/auth/verify-email.vue
View File

@@ -25,7 +25,7 @@
</ButtonStyled>
<ButtonStyled v-else>
<NuxtLink to="/auth/sign-in">
{{ formatMessage(messages.signIn) }}
{{ formatMessage(commonMessages.signInButton) }}
<RightArrowIcon />
</NuxtLink>
</ButtonStyled>
@@ -54,7 +54,7 @@
<ButtonStyled v-else color="brand">
<NuxtLink to="/auth/sign-in">
{{ formatMessage(messages.signIn) }}
{{ formatMessage(commonMessages.signInButton) }}
<RightArrowIcon />
</NuxtLink>
</ButtonStyled>
@@ -64,7 +64,13 @@
</template>
<script setup>
import { RightArrowIcon, SettingsIcon } from '@modrinth/assets'
import { ButtonStyled, defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
import {
ButtonStyled,
commonMessages,
defineMessages,
injectNotificationManager,
useVIntl,
} from '@modrinth/ui'
const { addNotification } = injectNotificationManager()
const { formatMessage } = useVIntl()
@@ -78,10 +84,6 @@ const messages = defineMessages({
id: 'auth.verify-email.action.account-settings',
defaultMessage: 'Account settings',
},
signIn: {
id: 'auth.verify-email.action.sign-in',
defaultMessage: 'Sign in',
},
})
const alreadyVerifiedMessages = defineMessages({

10
apps/frontend/src/pages/collection/[id].vue
View File

@@ -237,7 +237,7 @@
<AdPlaceholder v-if="!auth.user" />
<SidebarCard
v-if="collection.id !== 'following'"
:title="formatMessage(messages.detailsLabel)"
:title="formatMessage(commonMessages.detailsLabel)"
>
<div class="flex flex-col gap-2">
<span
@@ -458,14 +458,6 @@ const messages = defineMessages({
id: 'collection.label.curated-by',
defaultMessage: 'Curated by',
},
descriptionLabel: {
id: 'collection.label.description',
defaultMessage: 'Description',
},
detailsLabel: {
id: 'collection.label.details',
defaultMessage: 'Details',
},
deleteModalDescription: {
id: 'collection.delete-modal.description',
defaultMessage: 'This will permanently delete this collection. This action cannot be undone.',

20
apps/frontend/src/pages/index.vue
View File

@@ -93,7 +93,7 @@
<div class="search-controls">
<div class="iconified-input">
<label class="hidden" for="search">{{
formatMessage(messages.searchLabel)
formatMessage(commonMessages.searchLabel)
}}</label>
<SearchIcon aria-hidden="true" />
<input
@@ -101,13 +101,13 @@
v-model="searchQuery"
type="search"
name="search"
:placeholder="formatMessage(messages.searchPlaceholder)"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
autocomplete="off"
@input="updateSearchProjects"
/>
</div>
<div class="sort-by">
<span class="label">{{ formatMessage(messages.sortByLabel) }}</span>
<span class="label">{{ formatMessage(commonMessages.sortByLabel) }}</span>
<Multiselect
v-model="sortType"
placeholder="Select one"
@@ -155,7 +155,7 @@
</div>
<div class="blob-demonstration gradient-border">
<div class="notifs-demo">
<h3>{{ formatMessage(messages.notificationsHeading) }}</h3>
<h3>{{ formatMessage(commonMessages.notificationsLabel) }}</h3>
<div class="notifications">
<div
v-for="(notification, index) in notifications"
@@ -567,18 +567,6 @@ const messages = defineMessages({
defaultMessage:
"Modrinth's open-source API lets launchers add deep integration with Modrinth. You can use Modrinth through <link>our own app</link> and some of the most popular launchers like ATLauncher, MultiMC, and Prism Launcher.",
},
searchPlaceholder: {
id: 'landing.search.placeholder',
defaultMessage: 'Search...',
},
searchLabel: {
id: 'landing.search.label',
defaultMessage: 'Search',
},
sortByLabel: {
id: 'landing.search.sort-by.label',
defaultMessage: 'Sort by',
},
notificationsHeading: {
id: 'landing.notifications.heading',
defaultMessage: 'Notifications',

19
apps/frontend/src/pages/moderation/index.vue
View File

@@ -9,7 +9,7 @@
autocomplete="off"
spellcheck="false"
type="text"
:placeholder="formatMessage(messages.searchPlaceholder)"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
@input="goToPage(1)"
/>
<Button v-if="query" class="r-btn" @click="() => (query = '')">
@@ -28,7 +28,7 @@
v-model="currentFilterType"
class="!w-full flex-grow sm:!w-[280px] sm:flex-grow-0 lg:!w-[280px]"
:options="filterTypes"
:placeholder="formatMessage(messages.filterBy)"
:placeholder="formatMessage(commonMessages.filterByLabel)"
@select="goToPage(1)"
>
<template #selected>
@@ -45,7 +45,7 @@
v-model="currentSortType"
class="!w-full flex-grow sm:!w-[150px] sm:flex-grow-0 lg:!w-[150px]"
:options="sortTypes"
:placeholder="formatMessage(messages.sortBy)"
:placeholder="formatMessage(commonMessages.sortByLabel)"
@select="goToPage(1)"
>
<template #selected>
@@ -112,6 +112,7 @@ import {
ButtonStyled,
Combobox,
type ComboboxOption,
commonMessages,
defineMessages,
injectNotificationManager,
Pagination,
@@ -145,18 +146,6 @@ if (import.meta.client && history && history.state && history.state.confetti) {
}
const messages = defineMessages({
searchPlaceholder: {
id: 'moderation.search.placeholder',
defaultMessage: 'Search...',
},
filterBy: {
id: 'moderation.filter.by',
defaultMessage: 'Filter by',
},
sortBy: {
id: 'moderation.sort.by',
defaultMessage: 'Sort by',
},
moderate: {
id: 'moderation.moderate',
defaultMessage: 'Moderate',

23
apps/frontend/src/pages/moderation/reports/index.vue
View File

@@ -9,7 +9,7 @@
autocomplete="off"
spellcheck="false"
type="text"
:placeholder="formatMessage(messages.searchPlaceholder)"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
@input="goToPage(1)"
/>
<Button v-if="query" class="r-btn" @click="() => (query = '')">
@@ -26,7 +26,7 @@
v-model="currentFilterType"
class="!w-full flex-grow sm:!w-[280px] sm:flex-grow-0 lg:!w-[280px]"
:options="filterTypes"
:placeholder="formatMessage(messages.filterBy)"
:placeholder="formatMessage(commonMessages.filterByLabel)"
@select="goToPage(1)"
>
<template #selected>
@@ -43,7 +43,7 @@
v-model="currentSortType"
class="!w-full flex-grow sm:!w-[150px] sm:flex-grow-0 lg:!w-[150px]"
:options="sortTypes"
:placeholder="formatMessage(messages.sortBy)"
:placeholder="formatMessage(commonMessages.sortByLabel)"
@select="goToPage(1)"
>
<template #selected>
@@ -82,7 +82,7 @@ import {
Button,
Combobox,
type ComboboxOption,
defineMessages,
commonMessages,
Pagination,
useVIntl,
} from '@modrinth/ui'
@@ -98,21 +98,6 @@ const { formatMessage } = useVIntl()
const route = useRoute()
const router = useRouter()
const messages = defineMessages({
searchPlaceholder: {
id: 'moderation.search.placeholder',
defaultMessage: 'Search...',
},
filterBy: {
id: 'moderation.filter.by',
defaultMessage: 'Filter by',
},
sortBy: {
id: 'moderation.sort.by',
defaultMessage: 'Sort by',
},
})
const { data: allReports } = await useLazyAsyncData('new-moderation-reports', async () => {
const startTime = performance.now()
let currentOffset = 0

23
apps/frontend/src/pages/moderation/technical-review/index.vue
View File

@@ -13,7 +13,7 @@ import {
Button,
Combobox,
type ComboboxOption,
defineMessages,
commonMessages,
FloatingPanel,
injectModrinthClient,
Pagination,
@@ -163,21 +163,6 @@ function handleLoadFileSources(reportId: string): void {
}
}
const messages = defineMessages({
searchPlaceholder: {
id: 'moderation.search.placeholder',
defaultMessage: 'Search...',
},
filterBy: {
id: 'moderation.filter.by',
defaultMessage: 'Filter by',
},
sortBy: {
id: 'moderation.sort.by',
defaultMessage: 'Sort by',
},
})
const query = ref(route.query.q?.toString() || '')
watch(
@@ -534,7 +519,7 @@ watch([currentSortType, currentResponseFilter, inOtherQueueFilter, currentFilter
autocomplete="off"
spellcheck="false"
type="text"
:placeholder="formatMessage(messages.searchPlaceholder)"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
@input="goToPage(1)"
/>
<Button v-if="query" class="r-btn" @click="() => (query = '')">
@@ -572,7 +557,7 @@ watch([currentSortType, currentResponseFilter, inOtherQueueFilter, currentFilter
v-model="currentSortType"
class="!w-full flex-grow sm:!w-[215px] sm:flex-grow-0"
:options="sortTypes"
:placeholder="formatMessage(messages.sortBy)"
:placeholder="formatMessage(commonMessages.sortByLabel)"
>
<template #selected>
<span class="flex flex-row gap-2 align-middle font-semibold">
@@ -602,7 +587,7 @@ watch([currentSortType, currentResponseFilter, inOtherQueueFilter, currentFilter
v-model="currentFilterType"
class="!w-full"
:options="filterTypes"
:placeholder="formatMessage(messages.filterBy)"
:placeholder="formatMessage(commonMessages.filterByLabel)"
searchable
>
<template #selected>

42
apps/frontend/src/pages/settings/billing/index.vue
View File

@@ -516,18 +516,18 @@
<div class="font-bold text-contrast">
<template v-if="method.type === 'card'">
{{
formatMessage(messages.paymentMethodCardDisplay, {
formatMessage(paymentMethodMessages.paymentMethodCardDisplay, {
card_brand:
formatMessage(paymentMethodTypes[method.card.brand]) ??
formatMessage(paymentMethodTypes.unknown),
formatMessage(paymentMethodMessages[method.card.brand]) ??
formatMessage(paymentMethodMessages.unknown),
last_four: method.card.last4,
})
}}
</template>
<template v-else>
{{
formatMessage(paymentMethodTypes[method.type]) ??
formatMessage(paymentMethodTypes.unknown)
formatMessage(paymentMethodMessages[method.type]) ??
formatMessage(paymentMethodMessages.unknown)
}}
</template>
</div>
@@ -621,6 +621,7 @@ import {
getPaymentMethodIcon,
injectNotificationManager,
OverflowMenu,
paymentMethodMessages,
PurchaseModal,
ServerListing,
useVIntl,
@@ -721,10 +722,6 @@ const messages = defineMessages({
id: 'settings.billing.payment_method.action.primary',
defaultMessage: 'Make primary',
},
paymentMethodCardDisplay: {
id: 'settings.billing.payment_method.card_display',
defaultMessage: '{card_brand} ending in {last_four}',
},
paymentMethodCardExpiry: {
id: 'settings.billing.payment_method.card_expiry',
defaultMessage: 'Expires {month}/{year}',
@@ -739,33 +736,6 @@ const messages = defineMessages({
},
})
const paymentMethodTypes = defineMessages({
visa: {
id: 'settings.billing.payment_method_type.visa',
defaultMessage: 'Visa',
},
amex: { id: 'settings.billing.payment_method_type.amex', defaultMessage: 'American Express' },
diners: { id: 'settings.billing.payment_method_type.diners', defaultMessage: 'Diners Club' },
discover: { id: 'settings.billing.payment_method_type.discover', defaultMessage: 'Discover' },
eftpos: { id: 'settings.billing.payment_method_type.eftpos', defaultMessage: 'EFTPOS' },
jcb: { id: 'settings.billing.payment_method_type.jcb', defaultMessage: 'JCB' },
mastercard: {
id: 'settings.billing.payment_method_type.mastercard',
defaultMessage: 'MasterCard',
},
unionpay: { id: 'settings.billing.payment_method_type.unionpay', defaultMessage: 'UnionPay' },
paypal: { id: 'settings.billing.payment_method_type.paypal', defaultMessage: 'PayPal' },
cashapp: { id: 'settings.billing.payment_method_type.cashapp', defaultMessage: 'Cash App' },
amazon_pay: {
id: 'settings.billing.payment_method_type.amazon_pay',
defaultMessage: 'Amazon Pay',
},
unknown: {
id: 'settings.billing.payment_method_type.unknown',
defaultMessage: 'Unknown payment method',
},
})
const [
{ data: paymentMethods, refresh: refreshPaymentMethods },
{ data: charges, refresh: refreshCharges },

12
apps/frontend/src/pages/settings/profile.vue
View File

@@ -46,12 +46,12 @@
"
>
<UndoIcon />
{{ formatMessage(messages.profilePictureReset) }}
{{ formatMessage(commonMessages.resetButton) }}
</Button>
</div>
</div>
<label for="username-field">
<span class="label__title">{{ formatMessage(messages.usernameTitle) }}</span>
<span class="label__title">{{ formatMessage(commonMessages.usernameLabel) }}</span>
<span class="label__description">
{{ formatMessage(messages.usernameDescription) }}
</span>
@@ -120,14 +120,6 @@ const messages = defineMessages({
id: 'settings.profile.profile-picture.title',
defaultMessage: 'Profile picture',
},
profilePictureReset: {
id: 'settings.profile.profile-picture.reset',
defaultMessage: 'Reset',
},
usernameTitle: {
id: 'settings.profile.username.title',
defaultMessage: 'Username',
},
usernameDescription: {
id: 'settings.profile.username.description',
defaultMessage: 'A unique case-insensitive name to identify your profile.',

28
apps/frontend/src/pages/user/[id].vue
View File

@@ -34,7 +34,7 @@
<div class="flex flex-col gap-3">
<div v-if="isAdmin(auth.user)" class="flex flex-col gap-1">
<span class="text-lg font-bold text-primary">{{
formatMessage(messages.emailLabel)
formatMessage(commonMessages.emailLabel)
}}</span>
<div>
<span
@@ -61,8 +61,8 @@
<XIcon v-else class="h-4 w-4 text-red" />
{{
user.email_verified
? formatMessage(messages.yesLabel)
: formatMessage(messages.noLabel)
? formatMessage(commonMessages.yesLabel)
: formatMessage(commonMessages.noLabel)
}}
</span>
</div>
@@ -97,7 +97,9 @@
}}</span>
<span>
{{
user.has_password ? formatMessage(messages.yesLabel) : formatMessage(messages.noLabel)
user.has_password
? formatMessage(commonMessages.yesLabel)
: formatMessage(commonMessages.noLabel)
}}
</span>
</div>
@@ -107,7 +109,11 @@
formatMessage(messages.hasTotpLabel)
}}</span>
<span>
{{ user.has_totp ? formatMessage(messages.yesLabel) : formatMessage(messages.noLabel) }}
{{
user.has_totp
? formatMessage(commonMessages.yesLabel)
: formatMessage(commonMessages.noLabel)
}}
</span>
</div>
</div>
@@ -575,14 +581,6 @@ const messages = defineMessages({
id: 'profile.details.label.has-totp',
defaultMessage: 'Has TOTP',
},
yesLabel: {
id: 'profile.label.yes',
defaultMessage: 'Yes',
},
noLabel: {
id: 'profile.label.no',
defaultMessage: 'No',
},
bioFallbackUser: {
id: 'profile.bio.fallback.user',
defaultMessage: 'A Modrinth user.',
@@ -604,10 +602,6 @@ const messages = defineMessages({
id: 'profile.user-id',
defaultMessage: 'User ID: {id}',
},
profileDetails: {
id: 'profile.label.details',
defaultMessage: 'Details',
},
profileOrganizations: {
id: 'profile.label.organizations',
defaultMessage: 'Organizations',