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 2a28ae054a..8f5e71f5d6 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/apps/frontend/src/pages/[type]/[id]/settings/server.vue b/apps/frontend/src/pages/[type]/[id]/settings/server.vue index ce9e637e98..5ab99fa3ae 100644 --- a/apps/frontend/src/pages/[type]/[id]/settings/server.vue +++ b/apps/frontend/src/pages/[type]/[id]/settings/server.vue @@ -170,6 +170,7 @@ import { SERVER_REGIONS, StyledInput, UnsavedChangesPopup, + useVIntl, } from '@modrinth/ui' import { Multiselect } from 'vue-multiselect' @@ -177,6 +178,8 @@ import CompatibilityCard from '~/components/ui/project-settings/CompatibilityCar const PING_TIMEOUT_MS = 5000 +const { formatMessage, locale } = useVIntl() + const client = injectModrinthClient() const { addNotification } = injectNotificationManager() const { projectV3, currentMember, patchProjectV3 } = injectProjectPageContext() @@ -264,15 +267,31 @@ if (projectV3.value) { ) } -const regionOptions = SERVER_REGIONS.map((region) => ({ - value: region.code, - label: region.name, -})) - -const languageOptions = SERVER_LANGUAGES.map((language) => ({ - value: language.code, - label: language.name, -})) +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/ui/src/components/instances/modals/ModpackContentModal.vue b/packages/ui/src/components/instances/modals/ModpackContentModal.vue index 4a3eb84164..02354bacfb 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 @@ @@ -108,6 +108,7 @@ diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue index 4554b7d27e..f025f93afa 100644 --- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue +++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue @@ -4,7 +4,7 @@
@@ -17,7 +17,7 @@
-

Required content

+

{{ formatMessage(messages.requiredContent) }}

-

Minecraft: Java Edition

+

{{ formatMessage(messages.minecraftJava) }}

{{ version }} - +
-

Region

+

{{ formatMessage(messages.region) }}

-

Languages

+

{{ formatMessage(messages.languages) }}

- {{ languageDisplay.find((l) => l.value === language)?.label ?? language }} + {{ SERVER_LANGUAGES[language] ? formatMessage(SERVER_LANGUAGES[language]) : language }}
@@ -79,6 +81,7 @@ 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 @@