fix: i18n string problems (#6131)

* fix: apply non-json i18n fixes

* fix: pruning

* fix: prepr

* fix: run.mjs

* fix: lint

packages/ui/src/components/billing/ResubscribeModal.vue

@@ -182,15 +182,10 @@ const messages = defineMessages({
 		id: 'billing.resubscribe-modal.resubscribe',
 		defaultMessage: 'Resubscribe',
 	},
-	intervalMonthly: { id: 'billing.resubscribe-modal.interval.monthly', defaultMessage: '/month' },
-	intervalQuarterly: {
-		id: 'billing.resubscribe-modal.interval.quarterly',
-		defaultMessage: '/quarter',
-	},
-	intervalYearly: { id: 'billing.resubscribe-modal.interval.yearly', defaultMessage: '/year' },
-	intervalFiveDays: {
-		id: 'billing.resubscribe-modal.interval.five-days',
-		defaultMessage: '/5 days',
+	interval: {
+		id: 'billing.resubscribe-modal.interval',
+		defaultMessage:
+			'{intervalOption, select, fiveDays {/5 days} monthly {/month} quarterly {/quarter} yearly {/year} other {{interval}}}',
 	},
 	errorTitle: { id: 'billing.resubscribe-modal.error.title', defaultMessage: 'Error' },
 	errorText: {
@@ -202,18 +197,13 @@ const messages = defineMessages({
 const canResubscribe = computed(() => !!modalData.value?.subscriptionId)
 
 const intervalLabel = computed(() => {
-	switch (modalData.value?.interval) {
-		case 'monthly':
-			return formatMessage(messages.intervalMonthly)
-		case 'quarterly':
-			return formatMessage(messages.intervalQuarterly)
-		case 'yearly':
-			return formatMessage(messages.intervalYearly)
-		case 'five-days':
-			return formatMessage(messages.intervalFiveDays)
-		default:
-			return null
-	}
+	const { interval } = modalData.value ?? {}
+	if (!interval) return null
+
+	return formatMessage(messages.interval, {
+		interval,
+		intervalOption: interval === 'five-days' ? 'fiveDays' : interval,
+	})
 })
 
 const formattedPrice = computed(() => {

packages/ui/src/components/billing/ServersPurchase0Plan.vue

@@ -81,6 +81,11 @@ const messages = defineMessages({
 		id: 'servers.purchase.step.plan.your-current-plan',
 		defaultMessage: 'Your current plan',
 	},
+	billedInterval: {
+		id: 'servers.purchase.step.plan.billed',
+		defaultMessage:
+			'billed {interval, select, monthly {monthly} quarterly {quarterly} yearly {yearly} other {{interval}}}',
+	},
 })
 
 const isSameAsExistingPlan = computed(() => {
@@ -203,7 +208,8 @@ function selectCustom() {
 					</span>
 					<span class="text-sm">
 						/ month<template v-if="selectedInterval !== 'monthly'"
-							>, billed {{ selectedInterval }}</template
+							>,
+							{{ formatMessage(messages.billedInterval, { interval: selectedInterval }) }}</template
 						>
 					</span>
 				</div>
@@ -263,7 +269,10 @@ function selectCustom() {
 						</span>
 						<span class="text-sm">
 							/ month<template v-if="selectedInterval !== 'monthly'"
-								>, billed {{ selectedInterval }}</template
+								>,
+								{{
+									formatMessage(messages.billedInterval, { interval: selectedInterval })
+								}}</template
 							>
 						</span>
 					</div>
@@ -310,7 +319,8 @@ function selectCustom() {
 					</span>
 					<span class="text-sm">
 						/ month<template v-if="selectedInterval !== 'monthly'"
-							>, billed {{ selectedInterval }}</template
+							>,
+							{{ formatMessage(messages.billedInterval, { interval: selectedInterval }) }}</template
 						>
 					</span>
 				</div>

packages/ui/src/components/billing/ServersPurchase1Region.vue

@@ -182,6 +182,11 @@ const messages = defineMessages({
 		id: 'servers.region.custom.prompt-ram-only',
 		defaultMessage: `RAM`,
 	},
+	billedInterval: {
+		id: 'servers.purchase.step.plan.billed',
+		defaultMessage:
+			'billed {interval, select, monthly {monthly} quarterly {quarterly} yearly {yearly} other {{interval}}}',
+	},
 })
 
 async function updateStock() {
@@ -299,7 +304,9 @@ onMounted(() => {
 				<p v-if="selectedPrice" class="mt-2 mb-0">
 					<span class="text-contrast text-lg font-bold"
 						>{{ formatPrice(selectedPrice, currency, true) }} / month</span
-					><span v-if="interval !== 'monthly'">, billed {{ interval }}</span>
+					><span v-if="interval !== 'monthly'"
+						>, {{ formatMessage(messages.billedInterval, { interval }) }}</span
+					>
 				</p>
 				<div class="bg-bg rounded-xl p-4 mt-2 text-secondary h-14">
 					<div v-if="checkingCustomStock" class="flex gap-2 items-center">

packages/ui/src/components/servers/ServerListing.vue

@@ -296,7 +296,7 @@ const messages = defineMessages({
 	},
 	subscriptionCancelledOnDate: {
 		id: 'servers.listing.notice.subscription-cancelled-on-date',
-		defaultMessage: 'Your subscription was cancelled on <date>{formattedDate}</date>. ',
+		defaultMessage: 'Your subscription was cancelled on <date>{formattedDate}</date>.',
 	},
 	subscriptionCancelledPaymentFailed: {
 		id: 'servers.listing.notice.subscription-cancelled-payment-failed',
@@ -310,7 +310,7 @@ const messages = defineMessages({
 	filesKeptForDownload: {
 		id: 'servers.listing.notice.files-kept-for-download',
 		defaultMessage:
-			'Your files will be kept for <days-remaining>{daysRemaining} more {daysRemaining, plural, one {day} other {days} }</days-remaining>. Contact support to download the files before they are deleted. ',
+			'Your files will be kept for <days-remaining>{daysRemaining} more {daysRemaining, plural, one {day} other {days}}</days-remaining>. Contact support to download the files before they are deleted.',
 	},
 	subscriptionSetToCancel: {
 		id: 'servers.listing.notice.subscription-set-to-cancel',
@@ -326,7 +326,7 @@ const messages = defineMessages({
 	},
 	moderatedNotice: {
 		id: 'servers.listing.notice.moderated',
-		defaultMessage: 'Your server has been suspended by moderation action. ',
+		defaultMessage: 'Your server has been suspended by moderation action.',
 	},
 	suspendedNotice: {
 		id: 'servers.listing.notice.suspended',
@@ -364,7 +364,7 @@ const messages = defineMessages({
 	pendingChangeNotice: {
 		id: 'servers.listing.notice.pending-change',
 		defaultMessage:
-			'Your server will {verb} to the {planSize} Plan on <date>{formattedDate}</date>. ',
+			'Your server will {verb, select, downgrade {downgrade} other {upgrade}} to the {planSize} Plan on <date>{formattedDate}</date>.',
 	},
 })
 

packages/ui/src/components/servers/server-list-empty/ServerListEmpty.vue

@@ -212,7 +212,7 @@ const messages = defineMessages({
 	},
 	oneClickModInstallsDescription: {
 		id: 'servers.list-empty.one-click-mod-installs-description',
-		defaultMessage: 'Pick your favourite mods and we handle the rest.',
+		defaultMessage: 'Pick your favorite mods and we handle the rest.',
 	},
 	simpleSetupTitle: {
 		id: 'servers.list-empty.simple-setup-title',