merge queue: checking main (b8d9726), #7013 and #7020 together

apps/app-frontend/src/components/ui/modal/ModrinthAccountRequiredModal.vue

@@ -73,7 +73,7 @@
 				<div class="grid grid-cols-1 gap-2 sm:grid-cols-2">
 					<Button type="outlined" class="w-full" native-type="button" @click="modal?.hide()">
 						<XIcon aria-hidden="true" />
-						{{ formatMessage(messages.cancelButton) }}
+						{{ formatMessage(commonMessages.cancelButton) }}
 					</Button>
 					<Button
 						class="w-full"
@@ -106,7 +106,14 @@
 
 <script setup lang="ts">
 import { LogInIcon, RefreshCwIcon, SpinnerIcon, UserPlusIcon, XIcon } from '@modrinth/assets'
-import { Button, defineMessages, IntlFormatted, NewModal, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	IntlFormatted,
+	NewModal,
+	useVIntl,
+} from '@modrinth/ui'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { ref } from 'vue'
 
@@ -245,10 +252,6 @@ const messages = defineMessages({
 		id: 'modal.modrinth-account-required.waiting-for-browser',
 		defaultMessage: 'Waiting for browser confirmation...',
 	},
-	cancelButton: {
-		id: 'modal.modrinth-account-required.cancel-button',
-		defaultMessage: 'Cancel',
-	},
 	openBrowserAgainButton: {
 		id: 'modal.modrinth-account-required.open-browser-again-button',
 		defaultMessage: 'Open browser again',

apps/app-frontend/src/locales/da-DK/index.json

@@ -1112,9 +1112,6 @@
   "minecraft-required.sign-in": {
     "message": "Log ind på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuller"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsæt i din browser"
   },

apps/app-frontend/src/locales/de-CH/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },

apps/app-frontend/src/locales/de-DE/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Ein neuer Tab zum Anmelden wurde geöffnet. Schließe die Anmeldung dort ab und kehren anschließend zur App zurück."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Abbrechen"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Im Browser fortfahren"
   },

apps/app-frontend/src/locales/en-US/index.json

@@ -1880,9 +1880,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A new tab opened to sign in. Complete the sign in there, then return to the app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancel"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continue in your browser"
   },

apps/app-frontend/src/locales/es-419/index.json

@@ -1481,9 +1481,6 @@
   "minecraft-required.sign-in": {
     "message": "Iniciar sesión con Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.header": {
     "message": "Cuenta requerida"
   },

apps/app-frontend/src/locales/fr-FR/index.json

@@ -1754,9 +1754,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "A nouvel onglet a été ouvert pour vous connecter. Finissez la connexion, puis retournez dans l'application."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuler"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuer dans votre navigateur"
   },

apps/app-frontend/src/locales/hu-HU/index.json

@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Megnyílt egy új lap a bejelentkezéshez. Végezd el ott a bejelentkezést, majd térj vissza az alkalmazásba."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Mégse"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Folytatás a böngészőben"
   },

apps/app-frontend/src/locales/it-IT/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Si è aperta una nuova scheda per effettuare l'accesso. Poi torna all'app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annulla"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continua nel browser"
   },

apps/app-frontend/src/locales/ja-JP/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "サインイン用のタブが開きました。そちらでサインインを完了してから、アプリに戻ってください。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "キャンセル"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "ブラウザで続行"
   },

apps/app-frontend/src/locales/ko-KR/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "로그인을 위한 새 탭이 열렸습니다. 해당 탭에서 로그인을 완료한 후 앱 돌아오세요."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "취소"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "브라우저에서 계속 진행"
   },

apps/app-frontend/src/locales/nl-NL/index.json

@@ -1763,9 +1763,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Er is een nieuw tabblad geopend om je aan te melden. Log daar in en ga vervolgens terug naar de app."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Annuleren"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Doorgaan in je browser"
   },

apps/app-frontend/src/locales/pl-PL/index.json

@@ -1619,9 +1619,6 @@
   "minecraft-required.sign-in": {
     "message": "Zaloguj się do Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Anuluj"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Kontynuuj w przeglądarce"
   },

apps/app-frontend/src/locales/pt-BR/index.json

@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Uma nova aba foi aberta para iniciar sessão. Conclua lá, então volte ao aplicativo."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Cancelar"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Continuar em seu navegador"
   },

apps/app-frontend/src/locales/ru-RU/index.json

@@ -1844,9 +1844,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Открылась вкладка для входа. Завершение вход и вернитесь в приложение."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Отмена"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продолжите в браузере"
   },

apps/app-frontend/src/locales/sv-SE/index.json

@@ -1640,9 +1640,6 @@
   "minecraft-required.sign-in": {
     "message": "Logga in på Microsoft"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Avbryt"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Fortsätt i din webbläsare"
   },

apps/app-frontend/src/locales/tr-TR/index.json

@@ -1457,9 +1457,6 @@
   "minecraft-required.sign-in": {
     "message": "Microsoft'a giriş yap"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "İptal"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Tarayıcında devam et"
   },

apps/app-frontend/src/locales/uk-UA/index.json

@@ -1853,9 +1853,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "Відкрилася нова вкладка, де ви зможете ввійти. Увійдіть, тоді поверніться до застосунку."
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "Скасувати"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "Продовжити у браузері"
   },

apps/app-frontend/src/locales/zh-CN/index.json

@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一个新的标签页已打开，你需要在那里完成登录，然后回到Modrinth app。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "请在你的浏览器中继续"
   },

apps/app-frontend/src/locales/zh-TW/index.json

@@ -1856,9 +1856,6 @@
   "modal.modrinth-account-required.browser-description": {
     "message": "一個新分頁已開啟供你登入。請在該分頁完成登入，然後返回應用程式。"
   },
-  "modal.modrinth-account-required.cancel-button": {
-    "message": "取消"
-  },
   "modal.modrinth-account-required.continue-in-browser-heading": {
     "message": "在瀏覽器中繼續"
   },

apps/frontend/src/components/ui/dashboard/CreatorTaxFormModal.vue

@@ -133,7 +133,7 @@
 				</div>
 				<div class="flex w-full flex-row justify-stretch gap-2">
 					<Button class="w-full text-contrast" @click="handleClose">
-						{{ props.closeButtonText ?? formatMessage(messages.closeButton) }}
+						{{ props.closeButtonText ?? formatMessage(commonMessages.closeButton) }}
 					</Button>
 					<Button
 						type="colored"
@@ -267,10 +267,6 @@ const messages = defineMessages({
 		id: 'dashboard.creator-tax-form-modal.confirmation.download-button',
 		defaultMessage: 'Download {formType}',
 	},
-	closeButton: {
-		id: 'dashboard.creator-tax-form-modal.close-button',
-		defaultMessage: 'Close',
-	},
 	incompleteTitle: {
 		id: 'dashboard.creator-tax-form-modal.incomplete.title',
 		defaultMessage: 'Tax form incomplete',

apps/frontend/src/components/ui/moderation/ModpackScanModal.vue

@@ -11,6 +11,7 @@ import { Button, IconButton } from '@modrinth/ui'
 import {
 	Combobox,
 	type ComboboxOption,
+	commonMessages,
 	ConfirmModal,
 	defineMessages,
 	injectModrinthClient,
@@ -61,10 +62,6 @@ const messages = defineMessages({
 		id: 'modpack-scan-modal.scanning',
 		defaultMessage: 'Scanning...',
 	},
-	success: {
-		id: 'modpack-scan-modal.success',
-		defaultMessage: 'Success',
-	},
 	failed: {
 		id: 'modpack-scan-modal.failed',
 		defaultMessage: 'Failed',
@@ -102,10 +99,6 @@ const messages = defineMessages({
 		defaultMessage:
 			'This will permanently delete all attribution groups for this project and all files inside them. This action cannot be undone.',
 	},
-	deleteAllGroupsConfirmationProceed: {
-		id: 'modpack-scan-modal.delete-all-groups.proceed',
-		defaultMessage: 'Clear',
-	},
 	deleteAllGroupsSuccess: {
 		id: 'modpack-scan-modal.delete-all-groups.success',
 		defaultMessage: 'All groups cleared successfully.',
@@ -344,7 +337,7 @@ async function clearAllGroups() {
 	if (!failed) {
 		addNotification({
 			type: 'success',
-			title: formatMessage(messages.success),
+			title: formatMessage(commonMessages.successLabel),
 			text: formatMessage(messages.deleteAllGroupsSuccess),
 		})
 	}
@@ -369,7 +362,7 @@ defineExpose({ show, hide })
 		ref="clearModalRef"
 		:title="formatMessage(messages.deleteAllGroupsConfirmationTitle)"
 		:description="formatMessage(messages.deleteAllGroupsConfirmationDescription)"
-		:proceed-label="formatMessage(messages.deleteAllGroupsConfirmationProceed)"
+		:proceed-label="formatMessage(commonMessages.clearButton)"
 		@proceed="clearAllGroups"
 	/>
 

apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue

@@ -42,17 +42,15 @@ const plans: Record<
 	Plan,
 	{
 		buttonColor: 'blue' | 'green' | 'purple'
-		accentText: string
-		accentBg: string
+		buttonClasses: string
 		name: MessageDescriptor
 		description: MessageDescriptor
 		mostPopular: boolean
 	}
 > = {
 	small: {
 		buttonColor: 'blue',
-		accentText: 'text-blue',
-		accentBg: 'bg-bg-blue',
+		buttonClasses: '!bg-highlight-blue !text-blue',
 		name: commonMessages.planSmallLabel,
 		description: defineMessage({
 			id: 'servers.plan.small.description',
@@ -62,8 +60,7 @@ const plans: Record<
 	},
 	medium: {
 		buttonColor: 'green',
-		accentText: 'text-green',
-		accentBg: 'bg-bg-green',
+		buttonClasses: '',
 		name: commonMessages.planMediumLabel,
 		description: defineMessage({
 			id: 'servers.plan.medium.description',
@@ -73,8 +70,7 @@ const plans: Record<
 	},
 	large: {
 		buttonColor: 'purple',
-		accentText: 'text-purple',
-		accentBg: 'bg-bg-purple',
+		buttonClasses: '!bg-highlight-purple !text-purple',
 		name: commonMessages.planLargeLabel,
 		description: defineMessage({
 			id: 'servers.plan.large.description',
@@ -150,16 +146,20 @@ const billingMonths = computed(() => {
 				v-if="outOfStock"
 				disabled
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 			>
 				{{ formatMessage(messages.outOfStock) }}
 			</Button>
 			<Button
 				v-else
 				size="xl"
-				:type="plans[plan].mostPopular ? 'colored' : 'base'"
-				:color="plans[plan].mostPopular ? plans[plan].buttonColor : undefined"
+				:type="plans[plan].mostPopular ? 'colored' : 'quiet'"
+				:color="plans[plan].buttonColor"
+				:interaction="plans[plan].mostPopular ? undefined : 'none'"
+				:class="plans[plan].buttonClasses"
 				@click="() => emit('select')"
 			>
 				{{ formatMessage(messages.selectPlanButton) }}

apps/frontend/src/locales/de-CH/index.json

@@ -1481,9 +1481,6 @@
   "dashboard.collections.sort.recently-updated": {
     "message": "Kürzlich aktualisiert"
   },
-  "dashboard.creator-tax-form-modal.close-button": {
-    "message": "Schließen"
-  },
   "dashboard.creator-tax-form-modal.confirmation.download-button": {
     "message": "{formType} herunterladen"
   },
@@ -2984,9 +2981,6 @@
   "modpack-scan-modal.delete-all-groups.error": {
     "message": "Fehler beim Löschen aller Gruppen: {error}"
   },
-  "modpack-scan-modal.delete-all-groups.proceed": {
-    "message": "Löschen"
-  },
   "modpack-scan-modal.delete-all-groups.success": {
     "message": "Alle Gruppen wurden gelöscht."
   },
@@ -3026,9 +3020,6 @@
   "modpack-scan-modal.scanning": {
     "message": "Wird gescannt..."
   },
-  "modpack-scan-modal.success": {
-    "message": "Erfolg"
-  },
   "modpack-scan-modal.title": {
     "message": "Modpack-Scan ({scanned}/{total} Dateien)"
   },