Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ const messages = defineMessages({
unlinkInstanceConfirmDescription: {
id: 'instance.settings.tabs.installation.unlink.confirm.description',
defaultMessage:
'If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal.',
'If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal instance.',
},
reinstallModpackConfirmTitle: {
id: 'instance.settings.tabs.installation.reinstall.confirm.title',
Expand Down
2 changes: 1 addition & 1 deletion apps/app-frontend/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
"message": "Unlink instance"
},
"instance.settings.tabs.installation.unlink.confirm.description": {
"message": "If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal."
"message": "If you proceed, you will not be able to re-link it without creating an entirely new instance. You will no longer receive modpack updates and it will become a normal instance."
},
"instance.settings.tabs.installation.unlink.confirm.title": {
"message": "Are you sure you want to unlink this instance?"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ watch(
const messages = defineMessages({
entityQuestion: {
id: 'dashboard.creator-withdraw-modal.kyc.entity-question',
defaultMessage: 'Are you a withdrawing as an individual or business?',
defaultMessage: 'Are you withdrawing as an individual or a business?',
},
entityDescription: {
id: 'dashboard.creator-withdraw-modal.kyc.entity-description',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const messages = defineMessages({
info: {
id: 'hosting-marketing.medal.info',
defaultMessage:
'Try a free <orange>3GB server</orange> for 5 days powered by <orange>Medal</orange>',
'Try a free <orange>3 GB server</orange> for 5 days powered by <orange>Medal</orange>',
},
textSecondary: {
id: 'hosting-marketing.medal.text-secondary',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ const billingMonths = computed(() => {
</div>
<span class="m-0 text-2xl font-bold text-contrast">
{{ formatPrice(locale, price / billingMonths, currency, true) }}
{{ isUsa ? '' : currency }}
<span class="text-lg font-semibold text-secondary">
/ month<template v-if="interval !== 'monthly'">, billed {{ interval }}</template>
</span>
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/composables/auth/scopes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ export const scopeMessages = defineMessages({
},
sessionAccessDescription: {
id: 'scopes.sessionAccess.description',
defaultMessage: 'Access modrinth-issued sessions',
defaultMessage: 'Access Modrinth-issued sessions',
},
})

Expand Down
18 changes: 9 additions & 9 deletions apps/frontend/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"message": "Download options"
},
"app-marketing.download.terms": {
"message": "By downloading Modrinth App you agree to our <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>."
"message": "By downloading Modrinth App, you agree to our <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>."
},
"app-marketing.download.title": {
"message": "Download Modrinth App (Beta)"
Expand Down Expand Up @@ -108,7 +108,7 @@
"message": "% CPU"
},
"app-marketing.features.performance.description": {
"message": "Modrinth App performs better than many of the leading mod managers, using just 150mb of RAM!"
"message": "Modrinth App performs better than many of the leading mod managers, using just 150 MB of RAM!"
},
"app-marketing.features.performance.discord": {
"message": "Discord"
Expand Down Expand Up @@ -633,7 +633,7 @@
"message": "A business entity refers to a registered organization such as a corporation, partnership, or LLC."
},
"dashboard.creator-withdraw-modal.kyc.entity-question": {
"message": "Are you a withdrawing as an individual or business?"
"message": "Are you withdrawing as an individual or a business?"
},
"dashboard.creator-withdraw-modal.kyc.private-individual": {
"message": "Private individual"
Expand Down Expand Up @@ -1107,7 +1107,7 @@
"message": "Do Modrinth Hosting servers have DDoS protection?"
},
"hosting-marketing.faq.ddos-protection.answer": {
"message": "Yes. All Modrinth Hosting servers come with DDoS protection, with up to 17Tbps capacity in some locations."
"message": "Yes. All Modrinth Hosting servers come with DDoS protection, with up to 17 Tbps capacity in some locations."
},
"hosting-marketing.faq.heading": {
"message": "Frequently Asked Questions"
Expand Down Expand Up @@ -1215,7 +1215,7 @@
"message": "Know exactly what you need?"
},
"hosting-marketing.medal.info": {
"message": "Try a free <orange>3GB server</orange> for 5 days powered by <orange>Medal</orange>"
"message": "Try a free <orange>3 GB server</orange> for 5 days powered by <orange>Medal</orange>"
},
"hosting-marketing.medal.learn-more": {
"message": "Learn more"
Expand Down Expand Up @@ -2631,7 +2631,7 @@
"message": "Write reports"
},
"scopes.sessionAccess.description": {
"message": "Access modrinth-issued sessions"
"message": "Access Modrinth-issued sessions"
},
"scopes.sessionAccess.label": {
"message": "Access sessions"
Expand Down Expand Up @@ -2784,7 +2784,7 @@
"message": "Add more"
},
"settings.applications.button.add-redirect-uri": {
"message": "Add a redirect uri"
"message": "Add a redirect URI"
},
"settings.applications.button.cancel": {
"message": "Cancel"
Expand Down Expand Up @@ -2847,7 +2847,7 @@
"message": "https://example.com/auth/callback"
},
"settings.applications.field.redirect-uris": {
"message": "Redirect uris"
"message": "Redirect URIs"
},
"settings.applications.field.scopes": {
"message": "Scopes"
Expand Down Expand Up @@ -3006,7 +3006,7 @@
"message": "Create a PAT"
},
"settings.pats.description": {
"message": "PATs can be used to access Modrinth's API. For more information, see <doc-link>Modrinth's API documentation</doc-link>. They can be created and revoked at any time."
"message": "PATs can be used to access Modrinth's API. They can be created and revoked at any time. For more information, see <doc-link>Modrinth's API documentation</doc-link>."
},
"settings.pats.modal.create.action": {
"message": "Create PAT"
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/pages/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ const messages = defineMessages({
performantDescription: {
id: 'app-marketing.features.performance.description',
defaultMessage:
'Modrinth App performs better than many of the leading mod managers, using just 150mb of RAM!',
'Modrinth App performs better than many of the leading mod managers, using just 150 MB of RAM!',
},
websiteIntegration: {
id: 'app-marketing.features.website.title',
Expand Down Expand Up @@ -485,7 +485,7 @@ const messages = defineMessages({
downloadTerms: {
id: 'app-marketing.download.terms',
defaultMessage:
'By downloading Modrinth App you agree to our <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>.',
'By downloading Modrinth App, you agree to our <terms-link>Terms</terms-link> and <privacy-link>Privacy Policy</privacy-link>.',
},
linuxDisclaimer: {
id: 'app-marketing.download.linux-disclaimer',
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/pages/hosting/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ const messages = defineMessages({
faqDDOSProtectionAnswer: {
id: 'hosting-marketing.faq.ddos-protection.answer',
defaultMessage:
'Yes. All Modrinth Hosting servers come with DDoS protection, with up to 17Tbps capacity in some locations.',
'Yes. All Modrinth Hosting servers come with DDoS protection, with up to 17 Tbps capacity in some locations.',
},
faqLocation: {
id: 'hosting-marketing.faq.location',
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/pages/settings/applications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ const messages = defineMessages({
},
redirectUrisLabel: {
id: 'settings.applications.field.redirect-uris',
defaultMessage: 'Redirect uris',
defaultMessage: 'Redirect URIs',
},
redirectUriPlaceholder: {
id: 'settings.applications.field.redirect-uri.placeholder',
Expand All @@ -349,7 +349,7 @@ const messages = defineMessages({
},
addRedirectUri: {
id: 'settings.applications.button.add-redirect-uri',
defaultMessage: 'Add a redirect uri',
defaultMessage: 'Add a redirect URI',
},
cancel: {
id: 'settings.applications.button.cancel',
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend/src/pages/settings/pats.vue
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ const messages = defineMessages({
description: {
id: 'settings.pats.description',
defaultMessage:
"PATs can be used to access Modrinth's API. For more information, see <doc-link>Modrinth's API documentation</doc-link>. They can be created and revoked at any time.",
"PATs can be used to access Modrinth's API. They can be created and revoked at any time. For more information, see <doc-link>Modrinth's API documentation</doc-link>.",
},
create: {
id: 'settings.pats.action.create',
Expand Down
4 changes: 2 additions & 2 deletions packages/assets/generated-icons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import type { FunctionalComponent, SVGAttributes } from 'vue'

export type IconComponent = FunctionalComponent<SVGAttributes>

import _AffiliateIcon from './icons/affiliate.svg?component'
import _AlignLeftIcon from './icons/align-left.svg?component'
import _ArchiveIcon from './icons/archive.svg?component'
Expand Down Expand Up @@ -327,6 +325,8 @@ import _XCircleIcon from './icons/x-circle.svg?component'
import _ZoomInIcon from './icons/zoom-in.svg?component'
import _ZoomOutIcon from './icons/zoom-out.svg?component'

export type IconComponent = FunctionalComponent<SVGAttributes>

export const AffiliateIcon = _AffiliateIcon
export const AlignLeftIcon = _AlignLeftIcon
export const ArchiveIcon = _ArchiveIcon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ENVIRONMENTS_COPY: Record<
description: defineMessage({
id: 'project.environment.server-only.description',
defaultMessage:
'All functionality is done server-side and is compatible with vanilla clients.',
'All functionality is done server-side and is compatible with vanilla clients. Also works on the internal server in singleplayer.',
}),
},
singleplayer_only: {
Expand All @@ -52,7 +52,7 @@ export const ENVIRONMENTS_COPY: Record<
description: defineMessage({
id: 'project.environment.dedicated-server-only.description',
defaultMessage:
'All functionality is done server-side and is compatible with vanilla clients.',
'All functionality is done server-side and is compatible with vanilla clients. Only works on dedicated servers.',
}),
},
client_and_server: {
Expand All @@ -62,8 +62,7 @@ export const ENVIRONMENTS_COPY: Record<
}),
description: defineMessage({
id: 'project.environment.client-and-server.description',
defaultMessage:
'Has some functionality on both the client and server, even if only partially.',
defaultMessage: 'Required on both the client and server.',
}),
},
client_only_server_optional: {
Expand All @@ -74,7 +73,7 @@ export const ENVIRONMENTS_COPY: Record<
description: defineMessage({
id: 'project.environment.client-only-server-optional.description',
defaultMessage:
'Has some functionality on both the client and server, even if only partially.',
'Most functionality is client-side, but installing it on the server enables enhanced functionality.',
}),
},
server_only_client_optional: {
Expand All @@ -85,7 +84,7 @@ export const ENVIRONMENTS_COPY: Record<
description: defineMessage({
id: 'project.environment.server-only-client-optional.description',
defaultMessage:
'Has some functionality on both the client and server, even if only partially.',
'Most functionality is server-side, but installing it on the client enables enhanced functionality.',
}),
},
client_or_server: {
Expand All @@ -107,7 +106,7 @@ export const ENVIRONMENTS_COPY: Record<
description: defineMessage({
id: 'project.environment.client-or-server-prefers-both.description',
defaultMessage:
'Has some functionality on both the client and server, even if only partially.',
'Has some functionality on both the client and server, even if only partially. Installing it on both leads to the best experience.',
}),
},
unknown: {
Expand Down
18 changes: 9 additions & 9 deletions packages/ui/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"defaultMessage": "Performance impact"
},
"header.category.resolutions": {
"defaultMessage": "Resolutions"
"defaultMessage": "Resolution"
},
"hosting.specs.burst": {
"defaultMessage": "Bursts up to {cpus} CPUs"
Expand Down Expand Up @@ -429,7 +429,7 @@
"defaultMessage": "Password"
},
"label.played": {
"defaultMessage": "Played {time}"
"defaultMessage": "Played {ago}"
},
"label.project": {
"defaultMessage": "Project"
Expand Down Expand Up @@ -825,13 +825,13 @@
"defaultMessage": "{count} {count, plural, one {download} other {downloads}}"
},
"project.environment.client-and-server.description": {
"defaultMessage": "Has some functionality on both the client and server, even if only partially."
"defaultMessage": "Required on both the client and server."
},
"project.environment.client-and-server.title": {
"defaultMessage": "Client and server, required on both"
},
"project.environment.client-only-server-optional.description": {
"defaultMessage": "Has some functionality on both the client and server, even if only partially."
"defaultMessage": "Most functionality is client-side, but installing it on the server enables enhanced functionality."
},
"project.environment.client-only-server-optional.title": {
"defaultMessage": "Client and server, optional on server"
Expand All @@ -843,7 +843,7 @@
"defaultMessage": "Client-side only"
},
"project.environment.client-or-server-prefers-both.description": {
"defaultMessage": "Has some functionality on both the client and server, even if only partially."
"defaultMessage": "Has some functionality on both the client and server, even if only partially. Installing it on both leads to the best experience."
},
"project.environment.client-or-server-prefers-both.title": {
"defaultMessage": "Client and server, best when installed on both"
Expand All @@ -855,19 +855,19 @@
"defaultMessage": "Client and server, optional on both"
},
"project.environment.dedicated-server-only.description": {
"defaultMessage": "All functionality is done server-side and is compatible with vanilla clients."
"defaultMessage": "All functionality is done server-side and is compatible with vanilla clients. Only works on dedicated servers."
},
"project.environment.dedicated-server-only.title": {
"defaultMessage": "Server-side only"
},
"project.environment.server-only-client-optional.description": {
"defaultMessage": "Has some functionality on both the client and server, even if only partially."
"defaultMessage": "Most functionality is server-side, but installing it on the client enables enhanced functionality."
},
"project.environment.server-only-client-optional.title": {
"defaultMessage": "Client and server, optional on client"
},
"project.environment.server-only.description": {
"defaultMessage": "All functionality is done server-side and is compatible with vanilla clients."
"defaultMessage": "All functionality is done server-side and is compatible with vanilla clients. Also works on the internal server in singleplayer."
},
"project.environment.server-only.title": {
"defaultMessage": "Server-side only, works in singleplayer too"
Expand All @@ -891,7 +891,7 @@
"defaultMessage": "Unknown environment"
},
"project.follower-count-tooltip": {
"defaultMessage": "{count} {count, plural, one {followers} other {followers}}"
"defaultMessage": "{count} {count, plural, one {follower} other {followers}}"
},
"project.settings.analytics.title": {
"defaultMessage": "Analytics"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/utils/common-messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const commonMessages = defineMessages({
},
playedLabel: {
id: 'label.played',
defaultMessage: 'Played {time}',
defaultMessage: 'Played {ago}',
},
privateLabel: {
id: 'collections.label.private',
Expand Down Expand Up @@ -391,7 +391,7 @@ export const commonMessages = defineMessages({
},
projectFollowers: {
id: 'project.follower-count-tooltip',
defaultMessage: '{count} {count, plural, one {followers} other {followers}}',
defaultMessage: '{count} {count, plural, one {follower} other {followers}}',
},
})

Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/utils/tag-messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ export function sortTagsForDisplay(tags: string[]): string[] {
export const categoryHeaderMessages = defineMessages({
resolutions: {
id: 'header.category.resolutions',
defaultMessage: 'Resolutions',
defaultMessage: 'Resolution',
},
categories: {
id: 'header.category.category',
Expand Down