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

Clean up formatters from prev PR (#5254)

Browse Source
This commit is contained in:
Prospector
2026-02-02 01:38:36 -08:00
committed by GitHub
parent a207daef0d
commit 11f00be606
8 changed files with 45 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
View File

@@ -18,7 +18,7 @@ import {
Chips,
Combobox,
defineMessages,
getTagMessageOrDefault,
formatLoader,
injectNotificationManager,
useVIntl,
} from '@modrinth/ui'
@@ -563,10 +563,7 @@ const messages = defineMessages({
? modpackVersion
? modpackVersion?.version_number
: 'Unknown version'
: (() => {
const message = getTagMessageOrDefault(instance.loader, 'loader')
return typeof message === 'string' ? message : formatMessage(message)
})()
: formatLoader(formatMessage, instance.loader)
}}
<template v-if="instance.loader !== 'vanilla' && !modpackProject">
{{ instance.loader_version || formatMessage(messages.unknownVersion) }}
@@ -676,10 +673,7 @@ const messages = defineMessages({
<h2 class="m-0 mt-4 text-lg font-extrabold text-contrast block">
{{
formatMessage(messages.loaderVersion, {
loader: (() => {
const message = getTagMessageOrDefault(loader, 'loader')
return typeof message === 'string' ? message : formatMessage(message)
})(),
loader: formatLoader(formatMessage, loader),
})
}}
</h2>
@@ -713,10 +707,7 @@ const messages = defineMessages({
? messages.alreadyInstalledVanilla
: messages.alreadyInstalledModded,
{
platform: (() => {
const message = getTagMessageOrDefault(loader, 'loader')
return typeof message === 'string' ? message : formatMessage(message)
})(),
platform: formatLoader(formatMessage, loader),
version: instance.loader_version,
game_version: gameVersion,
},

10
apps/frontend/src/components/ui/servers/ContentVersionEditModal.vue
View File

@@ -146,8 +146,7 @@
? 'All platforms'
: filtersRef?.selectedPlatforms
.map((x) => {
const message = getTagMessageOrDefault(x, 'loader')
return typeof message === 'string' ? message : formatMessage(message)
return formatLoader(formatMessage, x)
})
.join(', ')
}}
@@ -260,7 +259,7 @@ import {
Checkbox,
Combobox,
CopyCode,
getTagMessageOrDefault,
formatLoader,
NewModal,
TagItem,
useVIntl,
@@ -436,10 +435,7 @@ const formattedVersions = computed(() => {
if (secondLoaderPosition === -1) return -1
return firstLoaderPosition - secondLoaderPosition
})
.map((loader: string) => {
const message = getTagMessageOrDefault(loader, 'loader')
return typeof message === 'string' ? message : formatMessage(message)
}),
.map((loader: string) => formatLoader(formatMessage, loader)),
}
})

14
apps/frontend/src/pages/[type]/[id]/settings/tags.vue
View File

@@ -66,11 +66,7 @@
v-for="category in categoryLists[header]"
:key="`category-${header}-${category.name}`"
:model-value="current.selectedTags.includes(category)"
:description="
typeof getTagMessageOrDefault(category.name, 'category') === 'string'
? getTagMessageOrDefault(category.name, 'category')
: formatMessage(getTagMessageOrDefault(category.name, 'category'))
"
:description="formatCategory(formatMessage, category.name)"
class="category-selector"
@update:model-value="toggleCategory(category)"
>
@@ -106,11 +102,7 @@
:key="`featured-category-${category.name}`"
class="category-selector"
:model-value="current.featuredTags.includes(category)"
:description="
typeof getTagMessageOrDefault(category.name, 'category') === 'string'
? getTagMessageOrDefault(category.name, 'category')
: formatMessage(getTagMessageOrDefault(category.name, 'category'))
"
:description="formatCategory(formatMessage, category.name)"
:disabled="current.featuredTags.length >= 3 && !current.featuredTags.includes(category)"
@update:model-value="toggleFeaturedCategory(category)"
>
@@ -143,8 +135,8 @@
import { getCategoryIcon, StarIcon, TriangleAlertIcon } from '@modrinth/assets'
import {
Checkbox,
formatCategory,
FormattedTag,
getTagMessageOrDefault,
injectProjectPageContext,
UnsavedChangesPopup,
useSavable,