From 1bc7fee0f1c0045897fdf56813d642838322795a Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Fri, 6 Mar 2026 16:54:26 +0300
Subject: [PATCH 1/5] Translate and sort server filters

---
 .../src/pages/[type]/[id]/settings/server.vue |  81 +++---
 packages/assets/generated-icons.ts            | 221 ++++++++---------
 packages/moderation/src/data/nags/core.ts     |   2 +-
 .../src/data/nags/server-projects.ts          |   1 +
 packages/moderation/src/data/stages/links.ts  |   2 +-
 .../project/ProjectSidebarServerInfo.vue      |  45 +---
 .../project/server/ServerRegion.vue           |  20 +-
 packages/ui/src/locales/en-US/index.json      | 173 ++++++++++++-
 packages/ui/src/utils/server-search.ts        | 231 ++++++++++++++----
 packages/ui/src/utils/tag-messages.ts         |   8 +-
 packages/utils/utils.ts                       |   3 +
 11 files changed, 507 insertions(+), 280 deletions(-)

diff --git a/apps/frontend/src/pages/[type]/[id]/settings/server.vue b/apps/frontend/src/pages/[type]/[id]/settings/server.vue
index af88816222..bbf482b7b8 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/server.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/server.vue
@@ -168,13 +168,17 @@ import {
 	injectProjectPageContext,
 	StyledInput,
 	UnsavedChangesPopup,
+	useVIntl,
 } from '@modrinth/ui'
+import { SERVER_LANGUAGES, SERVER_REGIONS } from '@modrinth/ui/src/utils/server-search.ts'
 import { Multiselect } from 'vue-multiselect'
 
 import CompatibilityCard from '~/components/ui/project-settings/CompatibilityCard.vue'
 
 const PING_TIMEOUT_MS = 5000
 
+const { formatMessage, locale } = useVIntl()
+
 const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
 const { projectV3, currentMember, patchProjectV3 } = injectProjectPageContext()
@@ -262,58 +266,31 @@ if (projectV3.value) {
 	)
 }
 
-const regionOptions = [
-	{ value: 'us_east', label: 'US East' },
-	{ value: 'us_west', label: 'US West' },
-	{ value: 'europe', label: 'Europe' },
-	{ value: 'asia', label: 'Asia' },
-	{ value: 'australia', label: 'Australia' },
-	{ value: 'south_america', label: 'South America' },
-	{ value: 'middle_east', label: 'Middle East' },
-	{ value: 'russia', label: 'Russia' },
-]
-
-const languageOptions = [
-	{ value: 'en', label: 'English' },
-	{ value: 'es', label: 'Spanish' },
-	{ value: 'pt', label: 'Portuguese' },
-	{ value: 'fr', label: 'French' },
-	{ value: 'de', label: 'German' },
-	{ value: 'it', label: 'Italian' },
-	{ value: 'nl', label: 'Dutch' },
-	{ value: 'ru', label: 'Russian' },
-	{ value: 'uk', label: 'Ukrainian' },
-	{ value: 'pl', label: 'Polish' },
-	{ value: 'cs', label: 'Czech' },
-	{ value: 'sk', label: 'Slovak' },
-	{ value: 'hu', label: 'Hungarian' },
-	{ value: 'ro', label: 'Romanian' },
-	{ value: 'bg', label: 'Bulgarian' },
-	{ value: 'hr', label: 'Croatian' },
-	{ value: 'sr', label: 'Serbian' },
-	{ value: 'el', label: 'Greek' },
-	{ value: 'tr', label: 'Turkish' },
-	{ value: 'ar', label: 'Arabic' },
-	{ value: 'he', label: 'Hebrew' },
-	{ value: 'hi', label: 'Hindi' },
-	{ value: 'bn', label: 'Bengali' },
-	{ value: 'ur', label: 'Urdu' },
-	{ value: 'zh', label: 'Chinese' },
-	{ value: 'ja', label: 'Japanese' },
-	{ value: 'ko', label: 'Korean' },
-	{ value: 'th', label: 'Thai' },
-	{ value: 'vi', label: 'Vietnamese' },
-	{ value: 'id', label: 'Indonesian' },
-	{ value: 'ms', label: 'Malay' },
-	{ value: 'tl', label: 'Filipino' },
-	{ value: 'sv', label: 'Swedish' },
-	{ value: 'no', label: 'Norwegian' },
-	{ value: 'da', label: 'Danish' },
-	{ value: 'fi', label: 'Finnish' },
-	{ value: 'lt', label: 'Lithuanian' },
-	{ value: 'lv', label: 'Latvian' },
-	{ value: 'et', label: 'Estonian' },
-]
+const regionOptions = computed(() =>
+	Object.entries(SERVER_REGIONS)
+		.sort(([_, a], [__, b]) => {
+			const aFormatted = formatMessage(a)
+			const bFormatted = formatMessage(b)
+			return aFormatted.localeCompare(bFormatted, locale.value)
+		})
+		.map(([code, name]) => ({
+			value: code,
+			label: formatMessage(name),
+		})),
+)
+
+const languageOptions = computed(() =>
+	Object.entries(SERVER_LANGUAGES)
+		.sort(([_, a], [__, b]) => {
+			const aFormatted = formatMessage(a)
+			const bFormatted = formatMessage(b)
+			return aFormatted.localeCompare(bFormatted, locale.value)
+		})
+		.map(([code, name]) => ({
+			value: code,
+			label: formatMessage(name),
+		})),
+)
 
 const javaServerPatchData = computed(() => {
 	const addressChanged =
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 8c77ae7360..7acc69fc9a 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -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'
@@ -380,6 +378,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
@@ -755,140 +755,141 @@ export const XCircleIcon = _XCircleIcon
 export const ZoomInIcon = _ZoomInIcon
 export const ZoomOutIcon = _ZoomOutIcon
 
+
 export const categoryIconMap: Record<string, IconComponent> = {
-	adventure: TagCategoryAdventureIcon,
-	atmosphere: TagCategoryAtmosphereIcon,
-	audio: TagCategoryAudioIcon,
-	backpack: TagCategoryBackpackIcon,
-	badge: TagCategoryBadgeIcon,
+	'adventure': TagCategoryAdventureIcon,
+	'atmosphere': TagCategoryAtmosphereIcon,
+	'audio': TagCategoryAudioIcon,
+	'backpack': TagCategoryBackpackIcon,
+	'badge': TagCategoryBadgeIcon,
 	'badge-check': TagCategoryBadgeCheckIcon,
 	'bed-double': TagCategoryBedDoubleIcon,
-	blocks: TagCategoryBlocksIcon,
-	bloom: TagCategoryBloomIcon,
+	'blocks': TagCategoryBlocksIcon,
+	'bloom': TagCategoryBloomIcon,
 	'building-2': TagCategoryBuilding2Icon,
-	camera: TagCategoryCameraIcon,
-	cartoon: TagCategoryCartoonIcon,
-	castle: TagCategoryCastleIcon,
-	challenging: TagCategoryChallengingIcon,
-	clapperboard: TagCategoryClapperboardIcon,
-	cloud: TagCategoryCloudIcon,
+	'camera': TagCategoryCameraIcon,
+	'cartoon': TagCategoryCartoonIcon,
+	'castle': TagCategoryCastleIcon,
+	'challenging': TagCategoryChallengingIcon,
+	'clapperboard': TagCategoryClapperboardIcon,
+	'cloud': TagCategoryCloudIcon,
 	'colored-lighting': TagCategoryColoredLightingIcon,
-	combat: TagCategoryCombatIcon,
-	compass: TagCategoryCompassIcon,
+	'combat': TagCategoryCombatIcon,
+	'compass': TagCategoryCompassIcon,
 	'core-shaders': TagCategoryCoreShadersIcon,
-	crown: TagCategoryCrownIcon,
-	cursed: TagCategoryCursedIcon,
-	decoration: TagCategoryDecorationIcon,
-	dices: TagCategoryDicesIcon,
-	economy: TagCategoryEconomyIcon,
-	entities: TagCategoryEntitiesIcon,
-	environment: TagCategoryEnvironmentIcon,
-	equipment: TagCategoryEquipmentIcon,
-	fantasy: TagCategoryFantasyIcon,
-	film: TagCategoryFilmIcon,
-	flag: TagCategoryFlagIcon,
-	foliage: TagCategoryFoliageIcon,
-	fonts: TagCategoryFontsIcon,
-	food: TagCategoryFoodIcon,
-	footprints: TagCategoryFootprintsIcon,
+	'crown': TagCategoryCrownIcon,
+	'cursed': TagCategoryCursedIcon,
+	'decoration': TagCategoryDecorationIcon,
+	'dices': TagCategoryDicesIcon,
+	'economy': TagCategoryEconomyIcon,
+	'entities': TagCategoryEntitiesIcon,
+	'environment': TagCategoryEnvironmentIcon,
+	'equipment': TagCategoryEquipmentIcon,
+	'fantasy': TagCategoryFantasyIcon,
+	'film': TagCategoryFilmIcon,
+	'flag': TagCategoryFlagIcon,
+	'foliage': TagCategoryFoliageIcon,
+	'fonts': TagCategoryFontsIcon,
+	'food': TagCategoryFoodIcon,
+	'footprints': TagCategoryFootprintsIcon,
 	'game-mechanics': TagCategoryGameMechanicsIcon,
 	'gamepad-2': TagCategoryGamepad2Icon,
-	gauge: TagCategoryGaugeIcon,
-	globe: TagCategoryGlobeIcon,
+	'gauge': TagCategoryGaugeIcon,
+	'globe': TagCategoryGlobeIcon,
 	'grid-3x3': TagCategoryGrid3x3Icon,
-	gui: TagCategoryGuiIcon,
-	handshake: TagCategoryHandshakeIcon,
+	'gui': TagCategoryGuiIcon,
+	'handshake': TagCategoryHandshakeIcon,
 	'heart-crack': TagCategoryHeartCrackIcon,
 	'heart-pulse': TagCategoryHeartPulseIcon,
-	high: TagCategoryHighIcon,
-	house: TagCategoryHouseIcon,
-	items: TagCategoryItemsIcon,
+	'high': TagCategoryHighIcon,
+	'house': TagCategoryHouseIcon,
+	'items': TagCategoryItemsIcon,
 	'kitchen-sink': TagCategoryKitchenSinkIcon,
-	library: TagCategoryLibraryIcon,
-	lightweight: TagCategoryLightweightIcon,
-	locale: TagCategoryLocaleIcon,
-	lock: TagCategoryLockIcon,
-	low: TagCategoryLowIcon,
-	magic: TagCategoryMagicIcon,
-	management: TagCategoryManagementIcon,
+	'library': TagCategoryLibraryIcon,
+	'lightweight': TagCategoryLightweightIcon,
+	'locale': TagCategoryLocaleIcon,
+	'lock': TagCategoryLockIcon,
+	'low': TagCategoryLowIcon,
+	'magic': TagCategoryMagicIcon,
+	'management': TagCategoryManagementIcon,
 	'map-pinned': TagCategoryMapPinnedIcon,
-	medium: TagCategoryMediumIcon,
-	minigame: TagCategoryMinigameIcon,
-	mobs: TagCategoryMobsIcon,
-	modded: TagCategoryModdedIcon,
-	models: TagCategoryModelsIcon,
-	multiplayer: TagCategoryMultiplayerIcon,
-	network: TagCategoryNetworkIcon,
-	optimization: TagCategoryOptimizationIcon,
-	palette: TagCategoryPaletteIcon,
+	'medium': TagCategoryMediumIcon,
+	'minigame': TagCategoryMinigameIcon,
+	'mobs': TagCategoryMobsIcon,
+	'modded': TagCategoryModdedIcon,
+	'models': TagCategoryModelsIcon,
+	'multiplayer': TagCategoryMultiplayerIcon,
+	'network': TagCategoryNetworkIcon,
+	'optimization': TagCategoryOptimizationIcon,
+	'palette': TagCategoryPaletteIcon,
 	'path-tracing': TagCategoryPathTracingIcon,
 	'paw-print': TagCategoryPawPrintIcon,
-	pbr: TagCategoryPbrIcon,
-	pickaxe: TagCategoryPickaxeIcon,
-	potato: TagCategoryPotatoIcon,
-	quests: TagCategoryQuestsIcon,
-	realistic: TagCategoryRealisticIcon,
-	reflections: TagCategoryReflectionsIcon,
+	'pbr': TagCategoryPbrIcon,
+	'pickaxe': TagCategoryPickaxeIcon,
+	'potato': TagCategoryPotatoIcon,
+	'quests': TagCategoryQuestsIcon,
+	'realistic': TagCategoryRealisticIcon,
+	'reflections': TagCategoryReflectionsIcon,
 	'refresh-ccw': TagCategoryRefreshCcwIcon,
-	screenshot: TagCategoryScreenshotIcon,
+	'screenshot': TagCategoryScreenshotIcon,
 	'scroll-text': TagCategoryScrollTextIcon,
 	'semi-realistic': TagCategorySemiRealisticIcon,
-	shadows: TagCategoryShadowsIcon,
-	shield: TagCategoryShieldIcon,
-	simplistic: TagCategorySimplisticIcon,
-	skull: TagCategorySkullIcon,
-	social: TagCategorySocialIcon,
-	square: TagCategorySquareIcon,
-	storage: TagCategoryStorageIcon,
-	sword: TagCategorySwordIcon,
-	swords: TagCategorySwordsIcon,
-	target: TagCategoryTargetIcon,
-	technology: TagCategoryTechnologyIcon,
-	terminal: TagCategoryTerminalIcon,
-	theater: TagCategoryTheaterIcon,
-	themed: TagCategoryThemedIcon,
-	transportation: TagCategoryTransportationIcon,
+	'shadows': TagCategoryShadowsIcon,
+	'shield': TagCategoryShieldIcon,
+	'simplistic': TagCategorySimplisticIcon,
+	'skull': TagCategorySkullIcon,
+	'social': TagCategorySocialIcon,
+	'square': TagCategorySquareIcon,
+	'storage': TagCategoryStorageIcon,
+	'sword': TagCategorySwordIcon,
+	'swords': TagCategorySwordsIcon,
+	'target': TagCategoryTargetIcon,
+	'technology': TagCategoryTechnologyIcon,
+	'terminal': TagCategoryTerminalIcon,
+	'theater': TagCategoryTheaterIcon,
+	'themed': TagCategoryThemedIcon,
+	'transportation': TagCategoryTransportationIcon,
 	'tree-pine': TagCategoryTreePineIcon,
-	trophy: TagCategoryTrophyIcon,
-	tweaks: TagCategoryTweaksIcon,
-	users: TagCategoryUsersIcon,
-	utility: TagCategoryUtilityIcon,
+	'trophy': TagCategoryTrophyIcon,
+	'tweaks': TagCategoryTweaksIcon,
+	'users': TagCategoryUsersIcon,
+	'utility': TagCategoryUtilityIcon,
 	'vanilla-like': TagCategoryVanillaLikeIcon,
 	'wand-sparkles': TagCategoryWandSparklesIcon,
 	'wifi-off': TagCategoryWifiOffIcon,
-	worldgen: TagCategoryWorldgenIcon,
-	zap: TagCategoryZapIcon,
+	'worldgen': TagCategoryWorldgenIcon,
+	'zap': TagCategoryZapIcon,
 }
 
 export const loaderIconMap: Record<string, IconComponent> = {
-	babric: TagLoaderBabricIcon,
+	'babric': TagLoaderBabricIcon,
 	'bta-babric': TagLoaderBtaBabricIcon,
-	bukkit: TagLoaderBukkitIcon,
-	bungeecord: TagLoaderBungeecordIcon,
-	canvas: TagLoaderCanvasIcon,
-	datapack: TagLoaderDatapackIcon,
-	fabric: TagLoaderFabricIcon,
-	folia: TagLoaderFoliaIcon,
-	forge: TagLoaderForgeIcon,
-	geyser: TagLoaderGeyserIcon,
-	iris: TagLoaderIrisIcon,
+	'bukkit': TagLoaderBukkitIcon,
+	'bungeecord': TagLoaderBungeecordIcon,
+	'canvas': TagLoaderCanvasIcon,
+	'datapack': TagLoaderDatapackIcon,
+	'fabric': TagLoaderFabricIcon,
+	'folia': TagLoaderFoliaIcon,
+	'forge': TagLoaderForgeIcon,
+	'geyser': TagLoaderGeyserIcon,
+	'iris': TagLoaderIrisIcon,
 	'java-agent': TagLoaderJavaAgentIcon,
 	'legacy-fabric': TagLoaderLegacyFabricIcon,
-	liteloader: TagLoaderLiteloaderIcon,
-	minecraft: TagLoaderMinecraftIcon,
-	modloader: TagLoaderModloaderIcon,
-	mrpack: TagLoaderMrpackIcon,
-	neoforge: TagLoaderNeoforgeIcon,
-	nilloader: TagLoaderNilloaderIcon,
-	optifine: TagLoaderOptifineIcon,
-	ornithe: TagLoaderOrnitheIcon,
-	paper: TagLoaderPaperIcon,
-	purpur: TagLoaderPurpurIcon,
-	quilt: TagLoaderQuiltIcon,
-	rift: TagLoaderRiftIcon,
-	spigot: TagLoaderSpigotIcon,
-	sponge: TagLoaderSpongeIcon,
-	vanilla: TagLoaderVanillaIcon,
-	velocity: TagLoaderVelocityIcon,
-	waterfall: TagLoaderWaterfallIcon,
+	'liteloader': TagLoaderLiteloaderIcon,
+	'minecraft': TagLoaderMinecraftIcon,
+	'modloader': TagLoaderModloaderIcon,
+	'mrpack': TagLoaderMrpackIcon,
+	'neoforge': TagLoaderNeoforgeIcon,
+	'nilloader': TagLoaderNilloaderIcon,
+	'optifine': TagLoaderOptifineIcon,
+	'ornithe': TagLoaderOrnitheIcon,
+	'paper': TagLoaderPaperIcon,
+	'purpur': TagLoaderPurpurIcon,
+	'quilt': TagLoaderQuiltIcon,
+	'rift': TagLoaderRiftIcon,
+	'spigot': TagLoaderSpigotIcon,
+	'sponge': TagLoaderSpongeIcon,
+	'vanilla': TagLoaderVanillaIcon,
+	'velocity': TagLoaderVelocityIcon,
+	'waterfall': TagLoaderWaterfallIcon,
 }
diff --git a/packages/moderation/src/data/nags/core.ts b/packages/moderation/src/data/nags/core.ts
index 23ea9f7af9..a2af5fb9f9 100644
--- a/packages/moderation/src/data/nags/core.ts
+++ b/packages/moderation/src/data/nags/core.ts
@@ -148,7 +148,7 @@ export const coreNags: Nag[] = [
 		}),
 		status: 'suggestion',
 		shouldShow: (context: NagContext) => {
-			if (!!context.projectV3?.minecraft_server) return false
+			if (context.projectV3?.minecraft_server) return false
 			const featuredGalleryImage = context.project.gallery?.find((img) => img.featured)
 			return context.project?.gallery?.length === 0 || !featuredGalleryImage
 		},
diff --git a/packages/moderation/src/data/nags/server-projects.ts b/packages/moderation/src/data/nags/server-projects.ts
index caf092fcaa..affeac28c9 100644
--- a/packages/moderation/src/data/nags/server-projects.ts
+++ b/packages/moderation/src/data/nags/server-projects.ts
@@ -1,4 +1,5 @@
 import { defineMessage } from '@modrinth/ui'
+
 import type { Nag, NagContext } from '../../types/nags'
 
 export const serverProjectsNags: Nag[] = [
diff --git a/packages/moderation/src/data/stages/links.ts b/packages/moderation/src/data/stages/links.ts
index bc3b497619..bbed9b57be 100644
--- a/packages/moderation/src/data/stages/links.ts
+++ b/packages/moderation/src/data/stages/links.ts
@@ -21,7 +21,7 @@ const links: Stage = {
 		),
 	text: async (project, projectV3) => {
 		let text
-		if (!!projectV3?.minecraft_server)
+		if (projectV3?.minecraft_server)
 			text = (await import('../messages/checklist-text/links/server.md?raw')).default
 		else text = (await import('../messages/checklist-text/links/base.md?raw')).default
 
diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
index a9f841ad34..e8abcdf164 100644
--- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
+++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
@@ -66,7 +66,7 @@
 			<h3 class="text-primary text-base m-0">Languages</h3>
 			<div class="flex flex-wrap gap-1.5">
 				<TagItem v-for="language in languages" :key="`${language}`">
-					{{ languageDisplay.find((l) => l.value === language)?.label ?? language }}
+					{{ SERVER_LANGUAGES[language] ? formatMessage(SERVER_LANGUAGES[language]) : language }}
 				</TagItem>
 			</div>
 		</section>
@@ -75,6 +75,7 @@
 <script setup lang="ts">
 import type { Labrinth } from '@modrinth/api-client'
 import { CopyIcon, getLoaderIcon } from '@modrinth/assets'
+import { SERVER_LANGUAGES } from '@modrinth/ui'
 import { formatVersionsForDisplay, type GameVersionTag, type PlatformTag } from '@modrinth/utils'
 import { computed } from 'vue'
 
@@ -167,48 +168,6 @@ function handleCopyIP() {
 	})
 }
 
-const languageDisplay = [
-	{ value: 'en', label: 'English' },
-	{ value: 'es', label: 'Spanish' },
-	{ value: 'pt', label: 'Portuguese' },
-	{ value: 'fr', label: 'French' },
-	{ value: 'de', label: 'German' },
-	{ value: 'it', label: 'Italian' },
-	{ value: 'nl', label: 'Dutch' },
-	{ value: 'ru', label: 'Russian' },
-	{ value: 'uk', label: 'Ukrainian' },
-	{ value: 'pl', label: 'Polish' },
-	{ value: 'cs', label: 'Czech' },
-	{ value: 'sk', label: 'Slovak' },
-	{ value: 'hu', label: 'Hungarian' },
-	{ value: 'ro', label: 'Romanian' },
-	{ value: 'bg', label: 'Bulgarian' },
-	{ value: 'hr', label: 'Croatian' },
-	{ value: 'sr', label: 'Serbian' },
-	{ value: 'el', label: 'Greek' },
-	{ value: 'tr', label: 'Turkish' },
-	{ value: 'ar', label: 'Arabic' },
-	{ value: 'he', label: 'Hebrew' },
-	{ value: 'hi', label: 'Hindi' },
-	{ value: 'bn', label: 'Bengali' },
-	{ value: 'ur', label: 'Urdu' },
-	{ value: 'zh', label: 'Chinese' },
-	{ value: 'ja', label: 'Japanese' },
-	{ value: 'ko', label: 'Korean' },
-	{ value: 'th', label: 'Thai' },
-	{ value: 'vi', label: 'Vietnamese' },
-	{ value: 'id', label: 'Indonesian' },
-	{ value: 'ms', label: 'Malay' },
-	{ value: 'tl', label: 'Filipino' },
-	{ value: 'sv', label: 'Swedish' },
-	{ value: 'no', label: 'Norwegian' },
-	{ value: 'da', label: 'Danish' },
-	{ value: 'fi', label: 'Finnish' },
-	{ value: 'lt', label: 'Lithuanian' },
-	{ value: 'lv', label: 'Latvian' },
-	{ value: 'et', label: 'Estonian' },
-]
-
 const messages = defineMessages({
 	copied: {
 		id: `project.about.server.copied`,
diff --git a/packages/ui/src/components/project/server/ServerRegion.vue b/packages/ui/src/components/project/server/ServerRegion.vue
index ec7e471ca1..1dd2a3d517 100644
--- a/packages/ui/src/components/project/server/ServerRegion.vue
+++ b/packages/ui/src/components/project/server/ServerRegion.vue
@@ -1,24 +1,22 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
+import { useVIntl } from '../../../composables'
+import { SERVER_REGIONS } from '../../../utils'
 import { TagItem } from '../../base'
 
 const { region } = defineProps<{
 	region: string
 }>()
 
-const regionNames: Record<string, string> = {
-	us_east: 'US East',
-	us_west: 'US West',
-	europe: 'Europe',
-	asia: 'Asia',
-	australia: 'Australia',
-	south_america: 'South America',
-	middle_east: 'Middle East',
-	russia: 'Russia',
-}
+const { formatMessage } = useVIntl()
 
-const regionName = computed(() => regionNames[region] ?? region)
+const regionName = computed(() => {
+	const name = SERVER_REGIONS[region]
+	if (name) return formatMessage(name)
+
+	return region
+})
 </script>
 <template>
 	<TagItem>{{ regionName }}</TagItem>
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 5154420755..3bf652103f 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -989,9 +989,150 @@
   "project.recent-plays": {
     "defaultMessage": "{count} {count, plural, one {recent play} other {recent plays}}"
   },
+  "project.server.language.ar": {
+    "defaultMessage": "Arabic"
+  },
+  "project.server.language.bg": {
+    "defaultMessage": "Bulgarian"
+  },
+  "project.server.language.bn": {
+    "defaultMessage": "Bengali"
+  },
+  "project.server.language.cs": {
+    "defaultMessage": "Czech"
+  },
+  "project.server.language.da": {
+    "defaultMessage": "Danish"
+  },
+  "project.server.language.de": {
+    "defaultMessage": "German"
+  },
+  "project.server.language.el": {
+    "defaultMessage": "Greek"
+  },
+  "project.server.language.en": {
+    "defaultMessage": "English"
+  },
+  "project.server.language.es": {
+    "defaultMessage": "Spanish"
+  },
+  "project.server.language.et": {
+    "defaultMessage": "Estonian"
+  },
+  "project.server.language.fi": {
+    "defaultMessage": "Finnish"
+  },
+  "project.server.language.fr": {
+    "defaultMessage": "French"
+  },
+  "project.server.language.he": {
+    "defaultMessage": "Hebrew"
+  },
+  "project.server.language.hi": {
+    "defaultMessage": "Hindi"
+  },
+  "project.server.language.hr": {
+    "defaultMessage": "Croatian"
+  },
+  "project.server.language.hu": {
+    "defaultMessage": "Hungarian"
+  },
+  "project.server.language.id": {
+    "defaultMessage": "Indonesian"
+  },
+  "project.server.language.it": {
+    "defaultMessage": "Italian"
+  },
+  "project.server.language.ja": {
+    "defaultMessage": "Japanese"
+  },
+  "project.server.language.ko": {
+    "defaultMessage": "Korean"
+  },
+  "project.server.language.lt": {
+    "defaultMessage": "Lithuanian"
+  },
+  "project.server.language.lv": {
+    "defaultMessage": "Latvian"
+  },
+  "project.server.language.ms": {
+    "defaultMessage": "Malay"
+  },
+  "project.server.language.nl": {
+    "defaultMessage": "Dutch"
+  },
+  "project.server.language.no": {
+    "defaultMessage": "Norwegian"
+  },
+  "project.server.language.pl": {
+    "defaultMessage": "Polish"
+  },
+  "project.server.language.pt": {
+    "defaultMessage": "Portuguese"
+  },
+  "project.server.language.ro": {
+    "defaultMessage": "Romanian"
+  },
+  "project.server.language.ru": {
+    "defaultMessage": "Russian"
+  },
+  "project.server.language.sk": {
+    "defaultMessage": "Slovak"
+  },
+  "project.server.language.sr": {
+    "defaultMessage": "Serbian"
+  },
+  "project.server.language.sv": {
+    "defaultMessage": "Swedish"
+  },
+  "project.server.language.th": {
+    "defaultMessage": "Thai"
+  },
+  "project.server.language.tl": {
+    "defaultMessage": "Filipino"
+  },
+  "project.server.language.tr": {
+    "defaultMessage": "Turkish"
+  },
+  "project.server.language.uk": {
+    "defaultMessage": "Ukrainian"
+  },
+  "project.server.language.ur": {
+    "defaultMessage": "Urdu"
+  },
+  "project.server.language.vi": {
+    "defaultMessage": "Vietnamese"
+  },
+  "project.server.language.zh": {
+    "defaultMessage": "Chinese"
+  },
   "project.server.ping.ms": {
     "defaultMessage": "{ping} ms"
   },
+  "project.server.region.asia": {
+    "defaultMessage": "Asia"
+  },
+  "project.server.region.australia": {
+    "defaultMessage": "Australia"
+  },
+  "project.server.region.europe": {
+    "defaultMessage": "Europe"
+  },
+  "project.server.region.middle_east": {
+    "defaultMessage": "Middle East"
+  },
+  "project.server.region.russia": {
+    "defaultMessage": "Russia"
+  },
+  "project.server.region.south_america": {
+    "defaultMessage": "South America"
+  },
+  "project.server.region.us_east": {
+    "defaultMessage": "US East"
+  },
+  "project.server.region.us_west": {
+    "defaultMessage": "US West"
+  },
   "project.settings.analytics.title": {
     "defaultMessage": "Analytics"
   },
@@ -1226,9 +1367,33 @@
   "search.filter_type.project_id": {
     "defaultMessage": "Project ID"
   },
+  "search.filter_type.server_content_type": {
+    "defaultMessage": "Type"
+  },
+  "search.filter_type.server_language": {
+    "defaultMessage": "Language"
+  },
+  "search.filter_type.server_region": {
+    "defaultMessage": "Region"
+  },
+  "search.filter_type.server_status": {
+    "defaultMessage": "Status"
+  },
   "search.filter_type.shader_loader": {
     "defaultMessage": "Loader"
   },
+  "search.server_content_type.modpack": {
+    "defaultMessage": "Modded"
+  },
+  "search.server_content_type.vanilla": {
+    "defaultMessage": "Vanilla"
+  },
+  "search.server_status.offline": {
+    "defaultMessage": "Offline"
+  },
+  "search.server_status.online": {
+    "defaultMessage": "Online"
+  },
   "servers.backups.item.auto": {
     "defaultMessage": "Auto"
   },
@@ -1587,7 +1752,7 @@
     "defaultMessage": "Kitchen Sink"
   },
   "tag.category.kitpvp": {
-    "defaultMessage": "Kit PVP"
+    "defaultMessage": "Kit PvP"
   },
   "tag.category.library": {
     "defaultMessage": "Library"
@@ -1671,7 +1836,7 @@
     "defaultMessage": "Plots"
   },
   "tag.category.pokemon": {
-    "defaultMessage": "Pokemon"
+    "defaultMessage": "Pokémon"
   },
   "tag.category.potato": {
     "defaultMessage": "Potato"
@@ -1680,10 +1845,10 @@
     "defaultMessage": "Prison"
   },
   "tag.category.pve": {
-    "defaultMessage": "PVE"
+    "defaultMessage": "PvE"
   },
   "tag.category.pvp": {
-    "defaultMessage": "PVP"
+    "defaultMessage": "PvP"
   },
   "tag.category.questing": {
     "defaultMessage": "Questing"
diff --git a/packages/ui/src/utils/server-search.ts b/packages/ui/src/utils/server-search.ts
index 88ac2d8cd6..7f77efbc76 100644
--- a/packages/ui/src/utils/server-search.ts
+++ b/packages/ui/src/utils/server-search.ts
@@ -1,8 +1,10 @@
+import type { Labrinth } from '@modrinth/api-client'
 import { getCategoryIcon } from '@modrinth/assets'
+import { sortedCategories } from '@modrinth/utils'
 import { computed, type Ref, ref } from 'vue'
 import { useRoute } from 'vue-router'
 
-import { useVIntl } from '../composables/i18n'
+import { defineMessage, useVIntl } from '../composables/i18n'
 import type { FilterType, FilterValue, SortType, Tags } from './search'
 import { formatCategory, formatCategoryHeader } from './tag-messages'
 
@@ -55,35 +57,83 @@ const SERVER_CATEGORY_ICON_MAP: Record<string, string> = {
 	'world-resets': 'refresh-ccw',
 }
 
-export const SERVER_REGIONS = [
-	{ code: 'us_east', name: 'US East' },
-	{ code: 'us_west', name: 'US West' },
-	{ code: 'europe', name: 'Europe' },
-	{ code: 'asia', name: 'Asia' },
-	{ code: 'australia', name: 'Australia' },
-	{ code: 'south_america', name: 'South America' },
-	{ code: 'middle_east', name: 'Middle East' },
-	{ code: 'russia', name: 'Russia' },
-]
+export const SERVER_REGIONS = {
+	us_east: defineMessage({ id: 'project.server.region.us_east', defaultMessage: 'US East' }),
+	us_west: defineMessage({ id: 'project.server.region.us_west', defaultMessage: 'US West' }),
+	europe: defineMessage({ id: 'project.server.region.europe', defaultMessage: 'Europe' }),
+	asia: defineMessage({ id: 'project.server.region.asia', defaultMessage: 'Asia' }),
+	australia: defineMessage({ id: 'project.server.region.australia', defaultMessage: 'Australia' }),
+	south_america: defineMessage({
+		id: 'project.server.region.south_america',
+		defaultMessage: 'South America',
+	}),
+	middle_east: defineMessage({
+		id: 'project.server.region.middle_east',
+		defaultMessage: 'Middle East',
+	}),
+	russia: defineMessage({ id: 'project.server.region.russia', defaultMessage: 'Russia' }),
+}
 
-export const SERVER_LANGUAGES = [
-	{ code: 'en', name: 'English' },
-	{ code: 'de', name: 'German' },
-	{ code: 'fr', name: 'French' },
-	{ code: 'es', name: 'Spanish' },
-	{ code: 'pt', name: 'Portuguese' },
-	{ code: 'ru', name: 'Russian' },
-	{ code: 'zh', name: 'Chinese' },
-	{ code: 'ja', name: 'Japanese' },
-	{ code: 'ko', name: 'Korean' },
-	{ code: 'nl', name: 'Dutch' },
-	{ code: 'pl', name: 'Polish' },
-	{ code: 'it', name: 'Italian' },
-	{ code: 'tr', name: 'Turkish' },
-	{ code: 'sv', name: 'Swedish' },
-	{ code: 'fi', name: 'Finnish' },
+const searchableLanguages = [
+	'en',
+	'de',
+	'fr',
+	'es',
+	'pt',
+	'ru',
+	'zh',
+	'ja',
+	'ko',
+	'nl',
+	'pl',
+	'it',
+	'tr',
+	'sv',
+	'fi',
 ]
 
+export const SERVER_LANGUAGES = {
+	en: defineMessage({ id: 'project.server.language.en', defaultMessage: 'English' }),
+	es: defineMessage({ id: 'project.server.language.es', defaultMessage: 'Spanish' }),
+	pt: defineMessage({ id: 'project.server.language.pt', defaultMessage: 'Portuguese' }),
+	fr: defineMessage({ id: 'project.server.language.fr', defaultMessage: 'French' }),
+	de: defineMessage({ id: 'project.server.language.de', defaultMessage: 'German' }),
+	it: defineMessage({ id: 'project.server.language.it', defaultMessage: 'Italian' }),
+	nl: defineMessage({ id: 'project.server.language.nl', defaultMessage: 'Dutch' }),
+	ru: defineMessage({ id: 'project.server.language.ru', defaultMessage: 'Russian' }),
+	uk: defineMessage({ id: 'project.server.language.uk', defaultMessage: 'Ukrainian' }),
+	pl: defineMessage({ id: 'project.server.language.pl', defaultMessage: 'Polish' }),
+	cs: defineMessage({ id: 'project.server.language.cs', defaultMessage: 'Czech' }),
+	sk: defineMessage({ id: 'project.server.language.sk', defaultMessage: 'Slovak' }),
+	hu: defineMessage({ id: 'project.server.language.hu', defaultMessage: 'Hungarian' }),
+	ro: defineMessage({ id: 'project.server.language.ro', defaultMessage: 'Romanian' }),
+	bg: defineMessage({ id: 'project.server.language.bg', defaultMessage: 'Bulgarian' }),
+	hr: defineMessage({ id: 'project.server.language.hr', defaultMessage: 'Croatian' }),
+	sr: defineMessage({ id: 'project.server.language.sr', defaultMessage: 'Serbian' }),
+	el: defineMessage({ id: 'project.server.language.el', defaultMessage: 'Greek' }),
+	tr: defineMessage({ id: 'project.server.language.tr', defaultMessage: 'Turkish' }),
+	ar: defineMessage({ id: 'project.server.language.ar', defaultMessage: 'Arabic' }),
+	he: defineMessage({ id: 'project.server.language.he', defaultMessage: 'Hebrew' }),
+	hi: defineMessage({ id: 'project.server.language.hi', defaultMessage: 'Hindi' }),
+	bn: defineMessage({ id: 'project.server.language.bn', defaultMessage: 'Bengali' }),
+	ur: defineMessage({ id: 'project.server.language.ur', defaultMessage: 'Urdu' }),
+	zh: defineMessage({ id: 'project.server.language.zh', defaultMessage: 'Chinese' }),
+	ja: defineMessage({ id: 'project.server.language.ja', defaultMessage: 'Japanese' }),
+	ko: defineMessage({ id: 'project.server.language.ko', defaultMessage: 'Korean' }),
+	th: defineMessage({ id: 'project.server.language.th', defaultMessage: 'Thai' }),
+	vi: defineMessage({ id: 'project.server.language.vi', defaultMessage: 'Vietnamese' }),
+	id: defineMessage({ id: 'project.server.language.id', defaultMessage: 'Indonesian' }),
+	ms: defineMessage({ id: 'project.server.language.ms', defaultMessage: 'Malay' }),
+	tl: defineMessage({ id: 'project.server.language.tl', defaultMessage: 'Filipino' }),
+	sv: defineMessage({ id: 'project.server.language.sv', defaultMessage: 'Swedish' }),
+	no: defineMessage({ id: 'project.server.language.no', defaultMessage: 'Norwegian' }),
+	da: defineMessage({ id: 'project.server.language.da', defaultMessage: 'Danish' }),
+	fi: defineMessage({ id: 'project.server.language.fi', defaultMessage: 'Finnish' }),
+	lt: defineMessage({ id: 'project.server.language.lt', defaultMessage: 'Lithuanian' }),
+	lv: defineMessage({ id: 'project.server.language.lv', defaultMessage: 'Latvian' }),
+	et: defineMessage({ id: 'project.server.language.et', defaultMessage: 'Estonian' }),
+}
+
 export const SERVER_SORT_TYPES: SortType[] = [
 	{ display: 'Relevance', name: 'relevance' },
 	{ display: 'Verified Plays', name: 'minecraft_java_server.verified_plays_2w' },
@@ -114,7 +164,10 @@ export function useServerSearch(opts: {
 }) {
 	const { tags, query, maxResults, currentPage } = opts
 
-	const { formatMessage } = useVIntl()
+	const { formatMessage, locale } = useVIntl()
+	const formatCategoryName = (categoryName: string) => {
+		return formatCategory(formatMessage, categoryName)
+	}
 
 	const route = useRoute()
 
@@ -124,8 +177,8 @@ export function useServerSearch(opts: {
 
 	const serverFilterTypes = computed<FilterType[]>(() => {
 		const categoryFilters: Record<string, FilterType> = {}
-		for (const c of (tags.value?.categories ?? []).filter(
-			(c) => c.project_type === 'minecraft_java_server',
+		for (const c of sortedCategories(tags.value, formatCategoryName, locale.value).filter(
+			(c: Labrinth.Tags.v2.Category) => c.project_type === 'minecraft_java_server',
 		)) {
 			const filterTypeId = `server_category_${c.header}`
 			if (!categoryFilters[filterTypeId]) {
@@ -149,27 +202,57 @@ export function useServerSearch(opts: {
 			})
 		}
 
-		const featuresFilter = categoryFilters['server_category_minecraft_server_features']
-		if (featuresFilter) {
-			featuresFilter.options.sort((a, b) => {
-				if (a.id === 'pokemon') return -1
-				if (b.id === 'pokemon') return 1
-				return 0
+		const sortedRegions = Object.entries(SERVER_REGIONS).sort(([_, a], [__, b]) => {
+			const aFormatted = formatMessage(a)
+			const bFormatted = formatMessage(b)
+			return aFormatted.localeCompare(bFormatted, locale.value)
+		})
+
+		const sortedLanguages = Object.entries(SERVER_LANGUAGES)
+			.filter(([code, _]) => searchableLanguages.includes(code))
+			.sort(([_, a], [__, b]) => {
+				const aFormatted = formatMessage(a)
+				const bFormatted = formatMessage(b)
+				return aFormatted.localeCompare(bFormatted, locale.value)
 			})
-		}
 
 		return [
 			{
 				id: 'server_content_type',
-				formatted_name: 'Type',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.server_content_type',
+						defaultMessage: 'Type',
+					}),
+				),
 				supported_project_types: ['server'],
 				display: 'all',
 				query_param: 'sct',
 				supports_negative_filter: false,
 				searchable: false,
 				options: [
-					{ id: 'vanilla', formatted_name: 'Vanilla', method: 'or', value: 'vanilla' },
-					{ id: 'modpack', formatted_name: 'Modded', method: 'or', value: 'modpack' },
+					{
+						id: 'vanilla',
+						formatted_name: formatMessage(
+							defineMessage({
+								id: 'search.server_content_type.vanilla',
+								defaultMessage: 'Vanilla',
+							}),
+						),
+						method: 'or',
+						value: 'vanilla',
+					},
+					{
+						id: 'modpack',
+						formatted_name: formatMessage(
+							defineMessage({
+								id: 'search.server_content_type.modpack',
+								defaultMessage: 'Modded',
+							}),
+						),
+						method: 'or',
+						value: 'modpack',
+					},
 				],
 			},
 			...[
@@ -182,7 +265,12 @@ export function useServerSearch(opts: {
 				.filter(Boolean),
 			{
 				id: 'server_game_version',
-				formatted_name: 'Game Version',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.game_version',
+						defaultMessage: 'Game version',
+					}),
+				),
 				supported_project_types: ['server'],
 				display: 'scrollable',
 				query_param: 'sgv',
@@ -198,45 +286,80 @@ export function useServerSearch(opts: {
 			},
 			{
 				id: 'server_region',
-				formatted_name: 'Region',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.server_region',
+						defaultMessage: 'Region',
+					}),
+				),
 				supported_project_types: ['server'],
 				display: 'all',
 				query_param: 'sr',
 				supports_negative_filter: true,
 				searchable: false,
-				options: SERVER_REGIONS.map((r) => ({
-					id: r.code,
-					formatted_name: r.name,
+				options: sortedRegions.map(([code, name]) => ({
+					id: code,
+					formatted_name: formatMessage(name),
 					method: 'or' as const,
-					value: r.code,
+					value: code,
 				})),
 			},
 			{
 				id: 'server_language',
-				formatted_name: 'Language',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.server_language',
+						defaultMessage: 'Language',
+					}),
+				),
 				supported_project_types: ['server'],
 				display: 'scrollable',
 				query_param: 'sl',
 				supports_negative_filter: false,
 				searchable: true,
-				options: SERVER_LANGUAGES.map((l) => ({
-					id: l.code,
-					formatted_name: l.name,
+				options: sortedLanguages.map(([code, name]) => ({
+					id: code,
+					formatted_name: formatMessage(name),
 					method: 'or' as const,
-					value: l.code,
+					value: code,
 				})),
 			},
 			{
 				id: 'server_status',
-				formatted_name: 'Status',
+				formatted_name: formatMessage(
+					defineMessage({
+						id: 'search.filter_type.server_status',
+						defaultMessage: 'Status',
+					}),
+				),
 				supported_project_types: ['server'],
 				display: 'all',
 				query_param: 'sst',
 				supports_negative_filter: false,
 				searchable: false,
 				options: [
-					{ id: 'online', formatted_name: 'Online', method: 'or', value: 'online' },
-					{ id: 'offline', formatted_name: 'Offline', method: 'or', value: 'offline' },
+					{
+						id: 'online',
+						formatted_name: formatMessage(
+							defineMessage({
+								id: 'search.server_status.online',
+								defaultMessage: 'Online',
+							}),
+						),
+						method: 'or',
+						value: 'online',
+					},
+					{
+						id: 'offline',
+						formatted_name: formatMessage(
+							defineMessage({
+								id: 'search.server_status.offline',
+								defaultMessage: 'Offline',
+							}),
+						),
+						method: 'or',
+						value: 'offline',
+					},
 				],
 			},
 		]
diff --git a/packages/ui/src/utils/tag-messages.ts b/packages/ui/src/utils/tag-messages.ts
index b6a698b0fc..ef2d24c7b5 100644
--- a/packages/ui/src/utils/tag-messages.ts
+++ b/packages/ui/src/utils/tag-messages.ts
@@ -324,7 +324,7 @@ export const categoryMessages = defineMessages({
 	},
 	kitpvp: {
 		id: 'tag.category.kitpvp',
-		defaultMessage: 'Kit PVP',
+		defaultMessage: 'Kit PvP',
 	},
 	library: {
 		id: 'tag.category.library',
@@ -436,7 +436,7 @@ export const categoryMessages = defineMessages({
 	},
 	pokemon: {
 		id: 'tag.category.pokemon',
-		defaultMessage: 'Pokemon',
+		defaultMessage: 'Pokémon',
 	},
 	potato: {
 		id: 'tag.category.potato',
@@ -448,11 +448,11 @@ export const categoryMessages = defineMessages({
 	},
 	pve: {
 		id: 'tag.category.pve',
-		defaultMessage: 'PVE',
+		defaultMessage: 'PvE',
 	},
 	pvp: {
 		id: 'tag.category.pvp',
-		defaultMessage: 'PVP',
+		defaultMessage: 'PvP',
 	},
 	questing: {
 		id: 'tag.category.questing',
diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts
index 372abb5ad0..9f1759d038 100644
--- a/packages/utils/utils.ts
+++ b/packages/utils/utils.ts
@@ -72,6 +72,9 @@ export const sortedCategories = (tags, formatCategoryName, locale) => {
 			return x.indexOf(a.name) - x.indexOf(b.name)
 		}
 
+		if (a.name === 'pokemon') return -1
+		if (b.name === 'pokemon') return 1
+
 		const aFormatted = formatCategoryName(a.name)
 		const bFormatted = formatCategoryName(b.name)
 		return aFormatted.localeCompare(bFormatted, locale, { numeric: true })

From afcd435bf1295973206f4716e6417164101640cb Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Fri, 6 Mar 2026 16:56:32 +0300
Subject: [PATCH 2/5] Set team_members to unknown[]

---
 packages/api-client/src/modules/labrinth/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts
index f3ecab2d6e..c8018c014a 100644
--- a/packages/api-client/src/modules/labrinth/types.ts
+++ b/packages/api-client/src/modules/labrinth/types.ts
@@ -197,7 +197,7 @@ export namespace Labrinth {
 				body: string
 				requested_status: v2.ProjectStatus
 				initial_versions: unknown[]
-				team_members: any[]
+				team_members: unknown[]
 				categories: string[]
 				client_side: string
 				server_side: string

From 78cfbbd5ea2c4b4f4de6a6b2f9770ee517db6905 Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Sat, 7 Mar 2026 06:41:54 +0300
Subject: [PATCH 3/5] Additional fixes after merge

---
 packages/assets/generated-icons.ts     | 217 ++++++++++++-------------
 packages/ui/src/utils/server-search.ts |  28 ++--
 packages/utils/utils.ts                |  14 +-
 3 files changed, 128 insertions(+), 131 deletions(-)

diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 7acc69fc9a..ea1d254f20 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -755,141 +755,140 @@ export const XCircleIcon = _XCircleIcon
 export const ZoomInIcon = _ZoomInIcon
 export const ZoomOutIcon = _ZoomOutIcon
 
-
 export const categoryIconMap: Record<string, IconComponent> = {
-	'adventure': TagCategoryAdventureIcon,
-	'atmosphere': TagCategoryAtmosphereIcon,
-	'audio': TagCategoryAudioIcon,
-	'backpack': TagCategoryBackpackIcon,
-	'badge': TagCategoryBadgeIcon,
+	adventure: TagCategoryAdventureIcon,
+	atmosphere: TagCategoryAtmosphereIcon,
+	audio: TagCategoryAudioIcon,
+	backpack: TagCategoryBackpackIcon,
+	badge: TagCategoryBadgeIcon,
 	'badge-check': TagCategoryBadgeCheckIcon,
 	'bed-double': TagCategoryBedDoubleIcon,
-	'blocks': TagCategoryBlocksIcon,
-	'bloom': TagCategoryBloomIcon,
+	blocks: TagCategoryBlocksIcon,
+	bloom: TagCategoryBloomIcon,
 	'building-2': TagCategoryBuilding2Icon,
-	'camera': TagCategoryCameraIcon,
-	'cartoon': TagCategoryCartoonIcon,
-	'castle': TagCategoryCastleIcon,
-	'challenging': TagCategoryChallengingIcon,
-	'clapperboard': TagCategoryClapperboardIcon,
-	'cloud': TagCategoryCloudIcon,
+	camera: TagCategoryCameraIcon,
+	cartoon: TagCategoryCartoonIcon,
+	castle: TagCategoryCastleIcon,
+	challenging: TagCategoryChallengingIcon,
+	clapperboard: TagCategoryClapperboardIcon,
+	cloud: TagCategoryCloudIcon,
 	'colored-lighting': TagCategoryColoredLightingIcon,
-	'combat': TagCategoryCombatIcon,
-	'compass': TagCategoryCompassIcon,
+	combat: TagCategoryCombatIcon,
+	compass: TagCategoryCompassIcon,
 	'core-shaders': TagCategoryCoreShadersIcon,
-	'crown': TagCategoryCrownIcon,
-	'cursed': TagCategoryCursedIcon,
-	'decoration': TagCategoryDecorationIcon,
-	'dices': TagCategoryDicesIcon,
-	'economy': TagCategoryEconomyIcon,
-	'entities': TagCategoryEntitiesIcon,
-	'environment': TagCategoryEnvironmentIcon,
-	'equipment': TagCategoryEquipmentIcon,
-	'fantasy': TagCategoryFantasyIcon,
-	'film': TagCategoryFilmIcon,
-	'flag': TagCategoryFlagIcon,
-	'foliage': TagCategoryFoliageIcon,
-	'fonts': TagCategoryFontsIcon,
-	'food': TagCategoryFoodIcon,
-	'footprints': TagCategoryFootprintsIcon,
+	crown: TagCategoryCrownIcon,
+	cursed: TagCategoryCursedIcon,
+	decoration: TagCategoryDecorationIcon,
+	dices: TagCategoryDicesIcon,
+	economy: TagCategoryEconomyIcon,
+	entities: TagCategoryEntitiesIcon,
+	environment: TagCategoryEnvironmentIcon,
+	equipment: TagCategoryEquipmentIcon,
+	fantasy: TagCategoryFantasyIcon,
+	film: TagCategoryFilmIcon,
+	flag: TagCategoryFlagIcon,
+	foliage: TagCategoryFoliageIcon,
+	fonts: TagCategoryFontsIcon,
+	food: TagCategoryFoodIcon,
+	footprints: TagCategoryFootprintsIcon,
 	'game-mechanics': TagCategoryGameMechanicsIcon,
 	'gamepad-2': TagCategoryGamepad2Icon,
-	'gauge': TagCategoryGaugeIcon,
-	'globe': TagCategoryGlobeIcon,
+	gauge: TagCategoryGaugeIcon,
+	globe: TagCategoryGlobeIcon,
 	'grid-3x3': TagCategoryGrid3x3Icon,
-	'gui': TagCategoryGuiIcon,
-	'handshake': TagCategoryHandshakeIcon,
+	gui: TagCategoryGuiIcon,
+	handshake: TagCategoryHandshakeIcon,
 	'heart-crack': TagCategoryHeartCrackIcon,
 	'heart-pulse': TagCategoryHeartPulseIcon,
-	'high': TagCategoryHighIcon,
-	'house': TagCategoryHouseIcon,
-	'items': TagCategoryItemsIcon,
+	high: TagCategoryHighIcon,
+	house: TagCategoryHouseIcon,
+	items: TagCategoryItemsIcon,
 	'kitchen-sink': TagCategoryKitchenSinkIcon,
-	'library': TagCategoryLibraryIcon,
-	'lightweight': TagCategoryLightweightIcon,
-	'locale': TagCategoryLocaleIcon,
-	'lock': TagCategoryLockIcon,
-	'low': TagCategoryLowIcon,
-	'magic': TagCategoryMagicIcon,
-	'management': TagCategoryManagementIcon,
+	library: TagCategoryLibraryIcon,
+	lightweight: TagCategoryLightweightIcon,
+	locale: TagCategoryLocaleIcon,
+	lock: TagCategoryLockIcon,
+	low: TagCategoryLowIcon,
+	magic: TagCategoryMagicIcon,
+	management: TagCategoryManagementIcon,
 	'map-pinned': TagCategoryMapPinnedIcon,
-	'medium': TagCategoryMediumIcon,
-	'minigame': TagCategoryMinigameIcon,
-	'mobs': TagCategoryMobsIcon,
-	'modded': TagCategoryModdedIcon,
-	'models': TagCategoryModelsIcon,
-	'multiplayer': TagCategoryMultiplayerIcon,
-	'network': TagCategoryNetworkIcon,
-	'optimization': TagCategoryOptimizationIcon,
-	'palette': TagCategoryPaletteIcon,
+	medium: TagCategoryMediumIcon,
+	minigame: TagCategoryMinigameIcon,
+	mobs: TagCategoryMobsIcon,
+	modded: TagCategoryModdedIcon,
+	models: TagCategoryModelsIcon,
+	multiplayer: TagCategoryMultiplayerIcon,
+	network: TagCategoryNetworkIcon,
+	optimization: TagCategoryOptimizationIcon,
+	palette: TagCategoryPaletteIcon,
 	'path-tracing': TagCategoryPathTracingIcon,
 	'paw-print': TagCategoryPawPrintIcon,
-	'pbr': TagCategoryPbrIcon,
-	'pickaxe': TagCategoryPickaxeIcon,
-	'potato': TagCategoryPotatoIcon,
-	'quests': TagCategoryQuestsIcon,
-	'realistic': TagCategoryRealisticIcon,
-	'reflections': TagCategoryReflectionsIcon,
+	pbr: TagCategoryPbrIcon,
+	pickaxe: TagCategoryPickaxeIcon,
+	potato: TagCategoryPotatoIcon,
+	quests: TagCategoryQuestsIcon,
+	realistic: TagCategoryRealisticIcon,
+	reflections: TagCategoryReflectionsIcon,
 	'refresh-ccw': TagCategoryRefreshCcwIcon,
-	'screenshot': TagCategoryScreenshotIcon,
+	screenshot: TagCategoryScreenshotIcon,
 	'scroll-text': TagCategoryScrollTextIcon,
 	'semi-realistic': TagCategorySemiRealisticIcon,
-	'shadows': TagCategoryShadowsIcon,
-	'shield': TagCategoryShieldIcon,
-	'simplistic': TagCategorySimplisticIcon,
-	'skull': TagCategorySkullIcon,
-	'social': TagCategorySocialIcon,
-	'square': TagCategorySquareIcon,
-	'storage': TagCategoryStorageIcon,
-	'sword': TagCategorySwordIcon,
-	'swords': TagCategorySwordsIcon,
-	'target': TagCategoryTargetIcon,
-	'technology': TagCategoryTechnologyIcon,
-	'terminal': TagCategoryTerminalIcon,
-	'theater': TagCategoryTheaterIcon,
-	'themed': TagCategoryThemedIcon,
-	'transportation': TagCategoryTransportationIcon,
+	shadows: TagCategoryShadowsIcon,
+	shield: TagCategoryShieldIcon,
+	simplistic: TagCategorySimplisticIcon,
+	skull: TagCategorySkullIcon,
+	social: TagCategorySocialIcon,
+	square: TagCategorySquareIcon,
+	storage: TagCategoryStorageIcon,
+	sword: TagCategorySwordIcon,
+	swords: TagCategorySwordsIcon,
+	target: TagCategoryTargetIcon,
+	technology: TagCategoryTechnologyIcon,
+	terminal: TagCategoryTerminalIcon,
+	theater: TagCategoryTheaterIcon,
+	themed: TagCategoryThemedIcon,
+	transportation: TagCategoryTransportationIcon,
 	'tree-pine': TagCategoryTreePineIcon,
-	'trophy': TagCategoryTrophyIcon,
-	'tweaks': TagCategoryTweaksIcon,
-	'users': TagCategoryUsersIcon,
-	'utility': TagCategoryUtilityIcon,
+	trophy: TagCategoryTrophyIcon,
+	tweaks: TagCategoryTweaksIcon,
+	users: TagCategoryUsersIcon,
+	utility: TagCategoryUtilityIcon,
 	'vanilla-like': TagCategoryVanillaLikeIcon,
 	'wand-sparkles': TagCategoryWandSparklesIcon,
 	'wifi-off': TagCategoryWifiOffIcon,
-	'worldgen': TagCategoryWorldgenIcon,
-	'zap': TagCategoryZapIcon,
+	worldgen: TagCategoryWorldgenIcon,
+	zap: TagCategoryZapIcon,
 }
 
 export const loaderIconMap: Record<string, IconComponent> = {
-	'babric': TagLoaderBabricIcon,
+	babric: TagLoaderBabricIcon,
 	'bta-babric': TagLoaderBtaBabricIcon,
-	'bukkit': TagLoaderBukkitIcon,
-	'bungeecord': TagLoaderBungeecordIcon,
-	'canvas': TagLoaderCanvasIcon,
-	'datapack': TagLoaderDatapackIcon,
-	'fabric': TagLoaderFabricIcon,
-	'folia': TagLoaderFoliaIcon,
-	'forge': TagLoaderForgeIcon,
-	'geyser': TagLoaderGeyserIcon,
-	'iris': TagLoaderIrisIcon,
+	bukkit: TagLoaderBukkitIcon,
+	bungeecord: TagLoaderBungeecordIcon,
+	canvas: TagLoaderCanvasIcon,
+	datapack: TagLoaderDatapackIcon,
+	fabric: TagLoaderFabricIcon,
+	folia: TagLoaderFoliaIcon,
+	forge: TagLoaderForgeIcon,
+	geyser: TagLoaderGeyserIcon,
+	iris: TagLoaderIrisIcon,
 	'java-agent': TagLoaderJavaAgentIcon,
 	'legacy-fabric': TagLoaderLegacyFabricIcon,
-	'liteloader': TagLoaderLiteloaderIcon,
-	'minecraft': TagLoaderMinecraftIcon,
-	'modloader': TagLoaderModloaderIcon,
-	'mrpack': TagLoaderMrpackIcon,
-	'neoforge': TagLoaderNeoforgeIcon,
-	'nilloader': TagLoaderNilloaderIcon,
-	'optifine': TagLoaderOptifineIcon,
-	'ornithe': TagLoaderOrnitheIcon,
-	'paper': TagLoaderPaperIcon,
-	'purpur': TagLoaderPurpurIcon,
-	'quilt': TagLoaderQuiltIcon,
-	'rift': TagLoaderRiftIcon,
-	'spigot': TagLoaderSpigotIcon,
-	'sponge': TagLoaderSpongeIcon,
-	'vanilla': TagLoaderVanillaIcon,
-	'velocity': TagLoaderVelocityIcon,
-	'waterfall': TagLoaderWaterfallIcon,
+	liteloader: TagLoaderLiteloaderIcon,
+	minecraft: TagLoaderMinecraftIcon,
+	modloader: TagLoaderModloaderIcon,
+	mrpack: TagLoaderMrpackIcon,
+	neoforge: TagLoaderNeoforgeIcon,
+	nilloader: TagLoaderNilloaderIcon,
+	optifine: TagLoaderOptifineIcon,
+	ornithe: TagLoaderOrnitheIcon,
+	paper: TagLoaderPaperIcon,
+	purpur: TagLoaderPurpurIcon,
+	quilt: TagLoaderQuiltIcon,
+	rift: TagLoaderRiftIcon,
+	spigot: TagLoaderSpigotIcon,
+	sponge: TagLoaderSpongeIcon,
+	vanilla: TagLoaderVanillaIcon,
+	velocity: TagLoaderVelocityIcon,
+	waterfall: TagLoaderWaterfallIcon,
 }
diff --git a/packages/ui/src/utils/server-search.ts b/packages/ui/src/utils/server-search.ts
index 923da25b72..01289399dd 100644
--- a/packages/ui/src/utils/server-search.ts
+++ b/packages/ui/src/utils/server-search.ts
@@ -9,20 +9,20 @@ import type { FilterType, FilterValue, SortType, Tags } from './search'
 import { formatCategory, formatCategoryHeader } from './tag-messages'
 
 export const SERVER_REGIONS = {
-    us_east: defineMessage({ id: 'project.server.region.us_east', defaultMessage: 'US East' }),
-    us_west: defineMessage({ id: 'project.server.region.us_west', defaultMessage: 'US West' }),
-    europe: defineMessage({ id: 'project.server.region.europe', defaultMessage: 'Europe' }),
-    asia: defineMessage({ id: 'project.server.region.asia', defaultMessage: 'Asia' }),
-    australia: defineMessage({ id: 'project.server.region.australia', defaultMessage: 'Australia' }),
-    south_america: defineMessage({
-        id: 'project.server.region.south_america',
-        defaultMessage: 'South America',
-    }),
-    middle_east: defineMessage({
-        id: 'project.server.region.middle_east',
-        defaultMessage: 'Middle East',
-    }),
-    russia: defineMessage({ id: 'project.server.region.russia', defaultMessage: 'Russia' }),
+	us_east: defineMessage({ id: 'project.server.region.us_east', defaultMessage: 'US East' }),
+	us_west: defineMessage({ id: 'project.server.region.us_west', defaultMessage: 'US West' }),
+	europe: defineMessage({ id: 'project.server.region.europe', defaultMessage: 'Europe' }),
+	asia: defineMessage({ id: 'project.server.region.asia', defaultMessage: 'Asia' }),
+	australia: defineMessage({ id: 'project.server.region.australia', defaultMessage: 'Australia' }),
+	south_america: defineMessage({
+		id: 'project.server.region.south_america',
+		defaultMessage: 'South America',
+	}),
+	middle_east: defineMessage({
+		id: 'project.server.region.middle_east',
+		defaultMessage: 'Middle East',
+	}),
+	russia: defineMessage({ id: 'project.server.region.russia', defaultMessage: 'Russia' }),
 }
 
 const searchableLanguages = [
diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts
index aa3d595619..32a6a5be82 100644
--- a/packages/utils/utils.ts
+++ b/packages/utils/utils.ts
@@ -69,16 +69,14 @@ const SERVER_HEADER_ORDER = [
 
 export const sortedCategories = (tags, formatCategoryName, locale) => {
 	return tags.categories.slice().sort((a, b) => {
-		const aServerIdx = SERVER_HEADER_ORDER.indexOf(a.header)
-		const bServerIdx = SERVER_HEADER_ORDER.indexOf(b.header)
-		if (aServerIdx !== -1 || bServerIdx !== -1) {
-			return (
-				(aServerIdx === -1 ? Infinity : aServerIdx) - (bServerIdx === -1 ? Infinity : bServerIdx)
-			)
-		}
-
 		const headerCompare = a.header.localeCompare(b.header)
 		if (headerCompare !== 0) {
+			const aServerIdx = SERVER_HEADER_ORDER.indexOf(a.header)
+			const bServerIdx = SERVER_HEADER_ORDER.indexOf(b.header)
+			if (aServerIdx !== -1 && bServerIdx !== -1) {
+				return aServerIdx - bServerIdx
+			}
+
 			return headerCompare
 		}
 

From f6b8741f662e5b97986a31b98d40823302179cf6 Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Sat, 7 Mar 2026 07:40:55 +0300
Subject: [PATCH 4/5] Additional translations

---
 .../ui/create/ProjectCreateModal.vue          |  4 --
 apps/frontend/src/locales/en-US/index.json    |  3 --
 .../instances/modals/ModpackContentModal.vue  |  4 --
 .../src/components/modal/OpenInAppModal.vue   |  7 +--
 .../project/ProjectSidebarCreators.vue        |  6 ++-
 .../project/ProjectSidebarServerInfo.vue      | 40 ++++++++++----
 .../components/project/ProjectSidebarTags.vue | 12 ++++-
 .../project/server/ServerModpackContent.vue   | 12 ++++-
 .../server/ServerModpackContentCard.vue       | 18 ++++++-
 .../components/project/server/ServerPing.vue  | 30 ++++++++---
 .../project/server/ServerRegion.vue           |  9 +++-
 packages/ui/src/locales/en-US/index.json      | 52 ++++++++++++++-----
 packages/ui/src/utils/server-search.ts        |  4 +-
 13 files changed, 145 insertions(+), 56 deletions(-)

diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
index aca341aa1c..77f51ac7b2 100644
--- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
@@ -229,10 +229,6 @@ const messages = defineMessages({
 		id: 'create.project.create-project',
 		defaultMessage: 'Create project',
 	},
-	createServerProject: {
-		id: 'create.project.create-server-project',
-		defaultMessage: 'Create server',
-	},
 	visibilityPublic: {
 		id: 'create.project.visibility-public',
 		defaultMessage: 'Public',
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 68a0e1c992..7ad471457e 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -497,9 +497,6 @@
   "create.project.create-project": {
     "message": "Create project"
   },
-  "create.project.create-server-project": {
-    "message": "Create server"
-  },
   "create.project.missing-fields-tooltip": {
     "message": "Missing fields: {fields}"
   },
diff --git a/packages/ui/src/components/instances/modals/ModpackContentModal.vue b/packages/ui/src/components/instances/modals/ModpackContentModal.vue
index 2d374105b3..932a89fd62 100644
--- a/packages/ui/src/components/instances/modals/ModpackContentModal.vue
+++ b/packages/ui/src/components/instances/modals/ModpackContentModal.vue
@@ -68,10 +68,6 @@ const messages = defineMessages({
 		id: 'instances.modpack-content-modal.no-results',
 		defaultMessage: 'No projects match your search.',
 	},
-	backButton: {
-		id: 'instances.modpack-content-modal.back-button',
-		defaultMessage: 'Back',
-	},
 	allFilter: {
 		id: 'instances.modpack-content-modal.filter-all',
 		defaultMessage: 'All',
diff --git a/packages/ui/src/components/modal/OpenInAppModal.vue b/packages/ui/src/components/modal/OpenInAppModal.vue
index 3f46862eb3..747e7c0906 100644
--- a/packages/ui/src/components/modal/OpenInAppModal.vue
+++ b/packages/ui/src/components/modal/OpenInAppModal.vue
@@ -91,7 +91,7 @@
 					<ButtonStyled class="flex-1">
 						<button @click="hide">
 							<XIcon />
-							{{ formatMessage(messages.close) }}
+							{{ formatMessage(commonMessages.closeButton) }}
 						</button>
 					</ButtonStyled>
 					<ButtonStyled color="green" class="flex-1">
@@ -108,6 +108,7 @@
 
 <script setup lang="ts">
 import { CheckIcon, DownloadIcon, XIcon } from '@modrinth/assets'
+import { commonMessages } from '@modrinth/ui'
 import { computed, nextTick, onUnmounted, ref } from 'vue'
 
 import { defineMessages, useVIntl } from '../../composables/i18n'
@@ -142,10 +143,6 @@ const messages = defineMessages({
 		id: 'modal.open-in-app.opening-automatically',
 		defaultMessage: 'The Modrinth App will open automatically...',
 	},
-	close: {
-		id: 'modal.open-in-app.close',
-		defaultMessage: 'Close',
-	},
 	getApp: {
 		id: 'modal.open-in-app.get-app',
 		defaultMessage: 'Get Modrinth App',
diff --git a/packages/ui/src/components/project/ProjectSidebarCreators.vue b/packages/ui/src/components/project/ProjectSidebarCreators.vue
index 85f623e2c9..1ebf460b6a 100644
--- a/packages/ui/src/components/project/ProjectSidebarCreators.vue
+++ b/packages/ui/src/components/project/ProjectSidebarCreators.vue
@@ -14,7 +14,7 @@
 							{{ organization.name }}
 						</span>
 						<span class="text-secondary text-sm font-medium flex items-center gap-1"
-							><OrganizationIcon /> Organization</span
+							><OrganizationIcon /> {{ formatMessage(messages.organization) }}</span
 						>
 					</div>
 				</AutoLink>
@@ -117,5 +117,9 @@ const messages = defineMessages({
 		id: 'project.about.creators.owner',
 		defaultMessage: 'Project owner',
 	},
+	organization: {
+		id: 'project.about.creators.organization',
+		defaultMessage: 'Organization',
+	},
 })
 </script>
diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
index 61b3d41c16..751fd281a7 100644
--- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
+++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
@@ -4,7 +4,7 @@
 
 		<div
 			v-if="ipAddress"
-			v-tooltip="`Copy Java IP: ${ipAddress}`"
+			v-tooltip="formatMessage(messages.ipTooltip, { ipAddress })"
 			class="bg-button-bg flex gap-2 justify-between rounded-2xl items-center px-3 pr-1.5 h-12 cursor-pointer hover:bg-button-bg-hover hover:brightness-125 transition-all active:scale-95"
 			@click="handleCopyIP"
 		>
@@ -17,7 +17,7 @@
 		</div>
 
 		<section v-if="requiredContent" class="flex flex-col gap-2">
-			<h3 class="text-primary text-base m-0">Required content</h3>
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.requiredContent) }}</h3>
 			<ServerModpackContentCard
 				:name="requiredContent.name"
 				:version-number="requiredContent.versionNumber ?? ''"
@@ -29,14 +29,16 @@
 			/>
 		</section>
 		<section v-if="recommendedVersions.length" class="flex flex-col gap-2">
-			<h3 class="text-primary text-base m-0">Minecraft: Java Edition</h3>
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.minecraftJava) }}</h3>
 			<div class="flex flex-wrap gap-1.5">
 				<TagItem
 					v-for="version in formatVersionsForDisplay(recommendedVersions, tags.gameVersions)"
 					:key="`recommended-tag-${version}`"
 				>
 					{{ version }}
-					<template v-if="supportedVersions.length > 0"> (Recommended) </template>
+					<template v-if="supportedVersions.length > 0">
+						{{ formatMessage(messages.recommendedVersion) }}
+					</template>
 				</TagItem>
 				<TagItem
 					v-for="version in formatVersionsForDisplay(supportedVersionsList, tags.gameVersions)"
@@ -56,7 +58,7 @@
 			</div>
 		</section>
 		<section v-if="props.ping !== undefined || region" class="flex flex-col gap-2">
-			<h3 class="text-primary text-base m-0">Region</h3>
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.region) }}</h3>
 			<div class="flex flex-wrap gap-1.5 items-center">
 				<ServerPing
 					v-if="projectV3?.status !== 'draft'"
@@ -67,7 +69,7 @@
 			</div>
 		</section>
 		<section v-if="languages.length > 0" class="flex flex-col gap-2">
-			<h3 class="text-primary text-base m-0">Languages</h3>
+			<h3 class="text-primary text-base m-0">{{ formatMessage(messages.languages) }}</h3>
 			<div class="flex flex-wrap gap-1.5">
 				<TagItem v-for="language in languages" :key="`${language}`">
 					{{ SERVER_LANGUAGES[language] ? formatMessage(SERVER_LANGUAGES[language]) : language }}
@@ -185,9 +187,29 @@ const messages = defineMessages({
 		id: `project.about.server.title`,
 		defaultMessage: 'Server details',
 	},
-	latency: {
-		id: `project.about.server.latency`,
-		defaultMessage: 'Latency',
+	ipTooltip: {
+		id: `project.about.server.ip.tooltip`,
+		defaultMessage: 'Copy Java IP: {ipAddress}',
+	},
+	requiredContent: {
+		id: `project.about.server.requiredContent`,
+		defaultMessage: 'Required content',
+	},
+	minecraftJava: {
+		id: `project.about.compatibility.game.minecraftJava`,
+		defaultMessage: 'Minecraft: Java Edition',
+	},
+	recommendedVersion: {
+		id: `project.about.server.recommendedVersion`,
+		defaultMessage: '(Recommended)',
+	},
+	region: {
+		id: `project.about.server.region`,
+		defaultMessage: 'Region',
+	},
+	languages: {
+		id: `project.about.server.languages`,
+		defaultMessage: 'Languages',
 	},
 })
 </script>
diff --git a/packages/ui/src/components/project/ProjectSidebarTags.vue b/packages/ui/src/components/project/ProjectSidebarTags.vue
index 7a88d37c7e..6a329ce901 100644
--- a/packages/ui/src/components/project/ProjectSidebarTags.vue
+++ b/packages/ui/src/components/project/ProjectSidebarTags.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="allTags.length > 0" class="flex flex-col gap-3">
-		<h2 class="text-lg m-0">Tags</h2>
+		<h2 class="text-lg m-0">{{ formatMessage(messages.title) }}</h2>
 		<div class="flex flex-wrap gap-1">
 			<TagItem
 				v-for="tag in allTags"
@@ -16,6 +16,7 @@
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
+import { defineMessages, useVIntl } from '../../composables'
 import FormattedTag from '../base/FormattedTag.vue'
 import TagItem from '../base/TagItem.vue'
 
@@ -42,6 +43,15 @@ const props = defineProps<{
 	}
 }>()
 
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	title: {
+		id: 'project.about.tags.title',
+		defaultMessage: 'Tags',
+	},
+})
+
 const allTags = computed(() => [
 	...props.project.categories,
 	...props.project.additional_categories,
diff --git a/packages/ui/src/components/project/server/ServerModpackContent.vue b/packages/ui/src/components/project/server/ServerModpackContent.vue
index 4bd8c6fa5b..def6ae59e3 100644
--- a/packages/ui/src/components/project/server/ServerModpackContent.vue
+++ b/packages/ui/src/components/project/server/ServerModpackContent.vue
@@ -1,6 +1,6 @@
 <template>
 	<div
-		v-tooltip="showCustomModpackTooltip ? 'This project uses a custom modpack' : name"
+		v-tooltip="showCustomModpackTooltip ? formatMessage(messages.customModpackTooltip) : name"
 		class="flex gap-1.5 items-center flex-shrink overflow-hidden smart-clickable:allow-pointer-events"
 		:class="[onclick ? 'hover:underline cursor-pointer' : '']"
 		@click="onclick"
@@ -13,6 +13,7 @@
 </template>
 
 <script setup lang="ts">
+import { defineMessages, useVIntl } from '../../../composables'
 import Avatar from '../../base/Avatar.vue'
 
 defineProps<{
@@ -21,4 +22,13 @@ defineProps<{
 	onclick?: () => void
 	showCustomModpackTooltip?: boolean
 }>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	customModpackTooltip: {
+		id: `project.server.customModpackTooltip`,
+		defaultMessage: 'This project uses a custom modpack',
+	},
+})
 </script>
diff --git a/packages/ui/src/components/project/server/ServerModpackContentCard.vue b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
index 2f748cdd32..ef66a91567 100644
--- a/packages/ui/src/components/project/server/ServerModpackContentCard.vue
+++ b/packages/ui/src/components/project/server/ServerModpackContentCard.vue
@@ -4,7 +4,7 @@
 			<Avatar :src="icon" size="34px" class="!rounded-xl !shadow-none" />
 			<div class="flex flex-col items-start overflow-hidden">
 				<div
-					v-tooltip="showCustomModpackTooltip ? 'This project uses a custom modpack' : name"
+					v-tooltip="showCustomModpackTooltip ? formatMessage(messages.customModpackTooltip) : name"
 					class="truncate font-semibold text-sm max-w-full"
 					:class="onclickName ? 'hover:underline cursor-pointer' : ''"
 					@click="onclickName"
@@ -22,7 +22,7 @@
 			</div>
 		</div>
 		<ButtonStyled v-if="onclickDownload" circular type="transparent">
-			<button v-tooltip="'Download modpack'" @click="onclickDownload">
+			<button v-tooltip="formatMessage(messages.downloadModpack)" @click="onclickDownload">
 				<DownloadIcon />
 			</button>
 		</ButtonStyled>
@@ -32,6 +32,7 @@
 <script setup lang="ts">
 import { DownloadIcon } from '@modrinth/assets/generated-icons'
 
+import { defineMessages, useVIntl } from '../../../composables'
 import Avatar from '../../base/Avatar.vue'
 import ButtonStyled from '../../base/ButtonStyled.vue'
 
@@ -44,4 +45,17 @@ defineProps<{
 	onclickDownload?: () => void
 	showCustomModpackTooltip?: boolean
 }>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	customModpackTooltip: {
+		id: `project.server.customModpackTooltip`,
+		defaultMessage: 'This project uses a custom modpack',
+	},
+	downloadModpack: {
+		id: `project.about.server.downloadModpack`,
+		defaultMessage: 'Download modpack',
+	},
+})
 </script>
diff --git a/packages/ui/src/components/project/server/ServerPing.vue b/packages/ui/src/components/project/server/ServerPing.vue
index 344b114bf0..a748afaa7d 100644
--- a/packages/ui/src/components/project/server/ServerPing.vue
+++ b/packages/ui/src/components/project/server/ServerPing.vue
@@ -2,7 +2,7 @@
 import { SignalIcon } from '@modrinth/assets'
 import { computed } from 'vue'
 
-import { defineMessage, useVIntl } from '../../../composables'
+import { defineMessages, useVIntl } from '../../../composables'
 import { TagItem } from '../../base'
 
 const props = defineProps<{
@@ -10,9 +10,23 @@ const props = defineProps<{
 	statusOnline?: boolean
 }>()
 
-const pingMessage = defineMessage({
-	id: 'project.server.ping.ms',
-	defaultMessage: '{ping} ms',
+const messages = defineMessages({
+	ping: {
+		id: 'project.server.ping.ms',
+		defaultMessage: '{ping} ms',
+	},
+	online: {
+		id: 'project.server.status.online',
+		defaultMessage: 'Online',
+	},
+	offline: {
+		id: 'project.server.status.offline',
+		defaultMessage: 'Offline',
+	},
+	offlineTooltip: {
+		id: 'project.server.status.offline.tooltip',
+		defaultMessage: 'Server is offline',
+	},
 })
 
 const { formatMessage } = useVIntl()
@@ -37,19 +51,19 @@ const pingClass = computed(() => {
 		:class="pingClass"
 	>
 		<template v-if="ping !== undefined">
-			{{ formatMessage(pingMessage, { ping }) }}
+			{{ formatMessage(messages.ping, { ping }) }}
 		</template>
 		<template v-else>
 			<SignalIcon />
-			Online
+			{{ formatMessage(messages.online) }}
 		</template>
 	</TagItem>
 	<TagItem
 		v-else
-		v-tooltip="'Server is offline'"
+		v-tooltip="formatMessage(messages.offlineTooltip)"
 		class="border !border-solid border-red bg-highlight-red text-red smart-clickable:allow-pointer-events w-max"
 	>
 		<SignalIcon />
-		Offline
+		{{ formatMessage(messages.offline) }}
 	</TagItem>
 </template>
diff --git a/packages/ui/src/components/project/server/ServerRegion.vue b/packages/ui/src/components/project/server/ServerRegion.vue
index 803210b625..1bf6716742 100644
--- a/packages/ui/src/components/project/server/ServerRegion.vue
+++ b/packages/ui/src/components/project/server/ServerRegion.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import { useVIntl } from '../../../composables'
+import { defineMessage, useVIntl } from '../../../composables'
 import { SERVER_REGIONS } from '../../../utils'
 import { TagItem } from '../../base'
 
@@ -11,6 +11,11 @@ const { region } = defineProps<{
 
 const { formatMessage } = useVIntl()
 
+const tooltip = defineMessage({
+	id: 'project.server.region.tooltip',
+	defaultMessage: 'Server hosted in {regionName}',
+})
+
 const regionName = computed(() => {
 	const name = SERVER_REGIONS[region]
 	if (name) return formatMessage(name)
@@ -19,5 +24,5 @@ const regionName = computed(() => {
 })
 </script>
 <template>
-	<TagItem v-tooltip="`Server hosted in ${regionName}`">{{ regionName }}</TagItem>
+	<TagItem v-tooltip="formatMessage(tooltip, { regionName })">{{ regionName }}</TagItem>
 </template>
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 3bf652103f..ddd0dad6bf 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -329,9 +329,6 @@
   "instances.modpack-card.unlink": {
     "defaultMessage": "Unlink modpack"
   },
-  "instances.modpack-content-modal.back-button": {
-    "defaultMessage": "Back"
-  },
   "instances.modpack-content-modal.copy-link": {
     "defaultMessage": "Copy link"
   },
@@ -557,9 +554,6 @@
   "modal.open-in-app.benefit.update": {
     "defaultMessage": "Keep files updated when the server changes"
   },
-  "modal.open-in-app.close": {
-    "defaultMessage": "Close"
-  },
   "modal.open-in-app.get-app": {
     "defaultMessage": "Get Modrinth App"
   },
@@ -839,6 +833,9 @@
   "project.about.compatibility.title": {
     "defaultMessage": "Compatibility"
   },
+  "project.about.creators.organization": {
+    "defaultMessage": "Organization"
+  },
   "project.about.creators.owner": {
     "defaultMessage": "Project owner"
   },
@@ -905,12 +902,30 @@
   "project.about.server.copiedText": {
     "defaultMessage": "IP address copied to clipboard"
   },
-  "project.about.server.latency": {
-    "defaultMessage": "Latency"
+  "project.about.server.downloadModpack": {
+    "defaultMessage": "Download modpack"
+  },
+  "project.about.server.ip.tooltip": {
+    "defaultMessage": "Copy Java IP: {ipAddress}"
+  },
+  "project.about.server.languages": {
+    "defaultMessage": "Languages"
+  },
+  "project.about.server.recommendedVersion": {
+    "defaultMessage": "(Recommended)"
+  },
+  "project.about.server.region": {
+    "defaultMessage": "Region"
+  },
+  "project.about.server.requiredContent": {
+    "defaultMessage": "Required content"
   },
   "project.about.server.title": {
     "defaultMessage": "Server details"
   },
+  "project.about.tags.title": {
+    "defaultMessage": "Tags"
+  },
   "project.download-count-tooltip": {
     "defaultMessage": "{count} {count, plural, one {download} other {downloads}}"
   },
@@ -989,6 +1004,9 @@
   "project.recent-plays": {
     "defaultMessage": "{count} {count, plural, one {recent play} other {recent plays}}"
   },
+  "project.server.customModpackTooltip": {
+    "defaultMessage": "This project uses a custom modpack"
+  },
   "project.server.language.ar": {
     "defaultMessage": "Arabic"
   },
@@ -1127,12 +1145,24 @@
   "project.server.region.south_america": {
     "defaultMessage": "South America"
   },
+  "project.server.region.tooltip": {
+    "defaultMessage": "Server hosted in {regionName}"
+  },
   "project.server.region.us_east": {
     "defaultMessage": "US East"
   },
   "project.server.region.us_west": {
     "defaultMessage": "US West"
   },
+  "project.server.status.offline": {
+    "defaultMessage": "Offline"
+  },
+  "project.server.status.offline.tooltip": {
+    "defaultMessage": "Server is offline"
+  },
+  "project.server.status.online": {
+    "defaultMessage": "Online"
+  },
   "project.settings.analytics.title": {
     "defaultMessage": "Analytics"
   },
@@ -1388,12 +1418,6 @@
   "search.server_content_type.vanilla": {
     "defaultMessage": "Vanilla"
   },
-  "search.server_status.offline": {
-    "defaultMessage": "Offline"
-  },
-  "search.server_status.online": {
-    "defaultMessage": "Online"
-  },
   "servers.backups.item.auto": {
     "defaultMessage": "Auto"
   },
diff --git a/packages/ui/src/utils/server-search.ts b/packages/ui/src/utils/server-search.ts
index 01289399dd..5bf0823d41 100644
--- a/packages/ui/src/utils/server-search.ts
+++ b/packages/ui/src/utils/server-search.ts
@@ -293,7 +293,7 @@ export function useServerSearch(opts: {
 						id: 'online',
 						formatted_name: formatMessage(
 							defineMessage({
-								id: 'search.server_status.online',
+								id: 'project.server.status.online',
 								defaultMessage: 'Online',
 							}),
 						),
@@ -304,7 +304,7 @@ export function useServerSearch(opts: {
 						id: 'offline',
 						formatted_name: formatMessage(
 							defineMessage({
-								id: 'search.server_status.offline',
+								id: 'project.server.status.offline',
 								defaultMessage: 'Offline',
 							}),
 						),

From 3db2236ac507e9da9f023da234da9de7af8b9be2 Mon Sep 17 00:00:00 2001
From: Jerozgen <jerozgen@gmail.com>
Date: Mon, 9 Mar 2026 09:09:04 +0300
Subject: [PATCH 5/5] Replace "IP" with "server address"

---
 .../components/project/ProjectSidebarServerInfo.vue    | 10 +++++-----
 packages/ui/src/locales/en-US/index.json               |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
index 751fd281a7..f025f93afa 100644
--- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
+++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
@@ -4,7 +4,7 @@
 
 		<div
 			v-if="ipAddress"
-			v-tooltip="formatMessage(messages.ipTooltip, { ipAddress })"
+			v-tooltip="formatMessage(messages.addressTooltip)"
 			class="bg-button-bg flex gap-2 justify-between rounded-2xl items-center px-3 pr-1.5 h-12 cursor-pointer hover:bg-button-bg-hover hover:brightness-125 transition-all active:scale-95"
 			@click="handleCopyIP"
 		>
@@ -181,15 +181,15 @@ const messages = defineMessages({
 	},
 	copiedText: {
 		id: `project.about.server.copiedText`,
-		defaultMessage: 'IP address copied to clipboard',
+		defaultMessage: 'Server address copied to clipboard',
 	},
 	title: {
 		id: `project.about.server.title`,
 		defaultMessage: 'Server details',
 	},
-	ipTooltip: {
-		id: `project.about.server.ip.tooltip`,
-		defaultMessage: 'Copy Java IP: {ipAddress}',
+	addressTooltip: {
+		id: `project.about.server.address.tooltip`,
+		defaultMessage: 'Copy Java server address',
 	},
 	requiredContent: {
 		id: `project.about.server.requiredContent`,
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index ddd0dad6bf..d3fb42698d 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -896,18 +896,18 @@
   "project.about.links.wiki": {
     "defaultMessage": "Visit wiki"
   },
+  "project.about.server.address.tooltip": {
+    "defaultMessage": "Copy Java server address"
+  },
   "project.about.server.copied": {
     "defaultMessage": "Copied!"
   },
   "project.about.server.copiedText": {
-    "defaultMessage": "IP address copied to clipboard"
+    "defaultMessage": "Server address copied to clipboard"
   },
   "project.about.server.downloadModpack": {
     "defaultMessage": "Download modpack"
   },
-  "project.about.server.ip.tooltip": {
-    "defaultMessage": "Copy Java IP: {ipAddress}"
-  },
   "project.about.server.languages": {
     "defaultMessage": "Languages"
   },