Compare commits

...
Author SHA1 Message Date
Calum H. (IMB11) 3c0a436c53 fix: lint 2026-07-20 19:20:25 +01:00
ProspectorandGitHub d8b059466d Merge branch 'main' into cal/page-header-component 2026-07-20 09:37:07 -07:00
Modrinth BotandGitHub 9bfa7c7e4a New translations from Crowdin (main) (#6780) 2026-07-20 12:33:30 +00:00
Michael H.andGitHub e52ae416a8 feat: email blacklist (#6779)
* feat: email blacklist

* feat: wildcard support
2026-07-20 14:02:55 +02:00
François-Xavier TalbotandGitHub 6319832465 feat: email bounce check (#6774)
* feat: neverbounce API client

* feat(labrinth): integrate neverbounce

* chore: tombi

* chore: typo

* chore: clippy

* chore: remove unused dep

* chore: cleanup
2026-07-20 10:58:46 +02:00
François-Xavier TalbotandGitHub 7144f08f0f feat: require verified email to publish, to prevent spam (#6777)
* feat: require verified email to create projects, collections and organizations

* fix(labrinth): fix tests

* chore: fmt

* chore: intl
2026-07-20 02:51:16 +00:00
François-Xavier TalbotandGitHub c579925f03 feat: honeypot signup field (#6776)
feat: account consent
2026-07-19 21:54:23 +00:00
François-Xavier TalbotandGitHub 6b569e4ee4 redis compression (#6769)
* feat(labrinth): encode/decode redis values with postcard, add version in namespaces

* chore(labrinth): split cache ex special cases without version

* chore(labrinth): simplify get_many

* fix: tombi

* feat(labrinth): compression support

* chore(labrinth): cleanup redis ser/de

* fix(labrinth): use get_deserialized in tests
2026-07-19 01:25:00 +02:00
François-Xavier TalbotandGitHub 6b62e3b480 fix(labrinth): register debug routes (#6766) 2026-07-19 01:24:52 +02:00
Calum H. (IMB11) c7b2577bee fix: lint 2026-07-15 15:08:56 +01:00
Calum H. (IMB11) 5e5607ccb6 fix: rev 2026-07-15 15:01:58 +01:00
Calum H. (IMB11) 0af6c117e6 Merge remote-tracking branch 'origin/main' into cal/page-header-component 2026-07-15 14:59:48 +01:00
Calum H. (IMB11) 505e6109fc fix: dedupe 2026-07-06 21:48:26 +01:00
Calum H. (IMB11) 32f44307bb fix: prepr 2026-07-06 21:15:08 +01:00
Calum H. (IMB11) 2b06292807 fix: rescan 2026-07-06 21:14:37 +01:00
Calum H. (IMB11) 1ae7599568 Merge remote-tracking branch 'origin/main' into cal/page-header-component 2026-07-06 21:14:19 +01:00
Calum H. (IMB11) f1f869bb8e fix: changes 2026-07-06 21:10:25 +01:00
Calum H. (IMB11) 98c4227a69 refactor: old impls 2026-07-06 20:42:32 +01:00
Calum H. (IMB11) 7b00a2e92b feat: refactor PageHeader (again) 2026-07-06 20:15:02 +01:00
Calum H. (IMB11) 8829aef4c6 fix: label inconsistencies 2026-07-06 10:58:55 +01:00
Calum H. (IMB11) 2dde071806 fix: lint 2026-07-06 10:49:25 +01:00
Calum H. (IMB11) c1d3b9d09c feat: split up according to component structure guide 2026-07-06 10:48:55 +01:00
Calum H. (IMB11) b3031269fa Merge branch 'main' of https://github.com/modrinth/code 2026-07-06 09:51:11 +01:00
Calum H. (IMB11) 12e608e7f0 refactor: introduce PageHeader component 2026-07-06 09:51:10 +01:00
168 changed files with 12833 additions and 2660 deletions
Generated
+44
View File
@@ -2133,6 +2133,15 @@ dependencies = [
"cc",
]
[[package]]
name = "cobs"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
dependencies = [
"thiserror 2.0.17",
]
[[package]]
name = "color-eyre"
version = "0.6.5"
@@ -3259,6 +3268,18 @@ version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
[[package]]
name = "embedded-io"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
[[package]]
name = "embedded-io"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
[[package]]
name = "encode_unicode"
version = "1.0.0"
@@ -5440,13 +5461,16 @@ dependencies = [
"json-patch 4.1.0",
"labrinth",
"lettre",
"lz4_flex",
"meilisearch-sdk",
"modrinth-content-management",
"modrinth-util",
"muralpay",
"murmur2",
"neverbounce",
"paste",
"path-util",
"postcard",
"prometheus",
"quick-xml 0.38.3",
"rand 0.8.5",
@@ -6224,6 +6248,14 @@ dependencies = [
"jni-sys",
]
[[package]]
name = "neverbounce"
version = "0.1.0"
dependencies = [
"reqwest 0.12.24",
"serde",
]
[[package]]
name = "new_debug_unreachable"
version = "1.0.6"
@@ -7492,6 +7524,18 @@ version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
[[package]]
name = "postcard"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
dependencies = [
"cobs",
"embedded-io 0.4.0",
"embedded-io 0.6.1",
"serde",
]
[[package]]
name = "potential_utf"
version = "0.1.3"
+9
View File
@@ -13,6 +13,7 @@ members = [
"packages/modrinth-log",
"packages/modrinth-maxmind",
"packages/modrinth-util",
"packages/neverbounce",
"packages/path-util",
]
@@ -118,6 +119,12 @@ lettre = { version = "0.11.19", default-features = false, features = [
"tokio1",
"tokio1-rustls",
] }
lz4_flex = { version = "0.11.5", default-features = false, features = [
"checked-decode",
"safe-decode",
"safe-encode",
"std",
] }
maxminddb = "0.26.0"
meilisearch-sdk = { version = "0.30.0", default-features = false }
modrinth-content-management = { path = "packages/modrinth-content-management" }
@@ -126,6 +133,7 @@ modrinth-util = { path = "packages/modrinth-util" }
muralpay = { path = "packages/muralpay" }
murmur2 = "0.1.0"
native-dialog = "0.9.2"
neverbounce = { path = "packages/neverbounce" }
notify = { version = "8.2.0", default-features = false }
notify-debouncer-mini = { version = "0.7.0", default-features = false }
objc2-app-kit = { version = "0.3.2", default-features = false }
@@ -135,6 +143,7 @@ paste = "1.0.15"
path-util = { path = "packages/path-util" }
phf = { version = "0.13.1", features = ["macros"] }
png = "0.18.0"
postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
proc-macro2 = { version = "1.0" }
prometheus = "0.14.0"
quartz_nbt = "0.2.9"
@@ -0,0 +1,294 @@
<template>
<PageHeader :title="instance.name">
<template #leading>
<Avatar :src="iconSrc" :alt="instance.name" size="64px" :tint-by="instance.id" />
</template>
<template #metadata>
<InstanceHeaderServerMetadata
v-if="isServerInstance"
:loading-server-ping="loadingServerPing"
:players-online="playersOnline"
:status-online="statusOnline"
:recent-plays="recentPlays"
:ping="ping"
:minecraft-server="minecraftServer"
:linked-project-v3="linkedProjectV3"
:instance-id="instance.id"
/>
<PageHeaderMetadata v-else>
<PageHeaderMetadataItem :icon="Gamepad2Icon" tooltip="Minecraft version">
Minecraft {{ instance.game_version }}
</PageHeaderMetadataItem>
<PageHeaderMetadataItem
:icon="ServerLoaderIcon"
:icon-props="{ loader: loaderDisplayName }"
tooltip="Mod loader"
>
{{ loaderLabel }}
</PageHeaderMetadataItem>
<PageHeaderMetadataItem
v-if="showInstancePlayTime"
:icon="TimerIcon"
tooltip="Total playtime"
>
{{ playtimeLabel }}
</PageHeaderMetadataItem>
</PageHeaderMetadata>
</template>
<template #actions>
<PageHeaderActions>
<ButtonStyled v-if="isInstalling" color="brand" size="large">
<button type="button" disabled>
{{ formatMessage(commonMessages.installingLabel) }}
</button>
</ButtonStyled>
<ButtonStyled v-else-if="instance.install_stage !== 'installed'" color="brand" size="large">
<button type="button" @click="emit('repair')">
<DownloadIcon />
{{ formatMessage(messages.repair) }}
</button>
</ButtonStyled>
<ButtonStyled v-else-if="playing" color="red" size="large">
<button type="button" :disabled="stopping" @click="emit('stop')">
<StopCircleIcon />
{{
stopping ? formatMessage(messages.stopping) : formatMessage(commonMessages.stopButton)
}}
</button>
</ButtonStyled>
<JoinedButtons
v-else-if="!loading && isServerInstance"
:actions="serverPlayActions"
color="brand"
size="large"
/>
<ButtonStyled v-else-if="!loading" color="brand" size="large">
<button type="button" @click="emit('play')">
<PlayIcon />
{{ formatMessage(commonMessages.playButton) }}
</button>
</ButtonStyled>
<ButtonStyled v-else color="brand" size="large">
<button type="button" disabled>{{ formatMessage(messages.starting) }}</button>
</ButtonStyled>
<ButtonStyled circular size="large">
<button
v-tooltip="formatMessage(messages.instanceSettings)"
type="button"
:aria-label="formatMessage(messages.instanceSettings)"
@click="emit('settings')"
>
<SettingsIcon />
</button>
</ButtonStyled>
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="moreActions"
:tooltip="formatMessage(messages.moreActions)"
:aria-label="formatMessage(messages.moreActions)"
>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</PageHeaderActions>
</template>
</PageHeader>
</template>
<script setup lang="ts">
import type { Labrinth } from '@modrinth/api-client'
import {
DownloadIcon,
ExternalIcon,
FolderOpenIcon,
MoreVerticalIcon,
PackageIcon,
PlayIcon,
SettingsIcon,
StopCircleIcon,
TagCategoryGamepad2Icon as Gamepad2Icon,
TimerIcon,
} from '@modrinth/assets'
import {
Avatar,
ButtonStyled,
commonMessages,
defineMessages,
formatLoaderLabel,
type JoinedButtonAction,
JoinedButtons,
LoaderIcon as ServerLoaderIcon,
PageHeader,
PageHeaderActions,
PageHeaderMetadata,
PageHeaderMetadataItem,
type ServerLoader,
TeleportOverflowMenu,
type TeleportOverflowMenuItem,
useVIntl,
} from '@modrinth/ui'
import { computed } from 'vue'
import type { GameInstance } from '@/helpers/types'
import InstanceHeaderServerMetadata from './instance-page-header-server-metadata.vue'
const messages = defineMessages({
createShortcut: {
id: 'instance.action.create-shortcut',
defaultMessage: 'Create shortcut',
},
exportModpack: {
id: 'instance.action.export-modpack',
defaultMessage: 'Export modpack',
},
instanceSettings: {
id: 'instance.action.settings',
defaultMessage: 'Instance settings',
},
launchInstance: {
id: 'instance.action.launch-instance',
defaultMessage: 'Launch instance',
},
moreActions: {
id: 'instance.action.more-actions',
defaultMessage: 'More actions',
},
neverPlayed: {
id: 'instance.playtime.never-played',
defaultMessage: 'Never played',
},
openFolder: {
id: 'instance.action.open-folder',
defaultMessage: 'Open folder',
},
repair: {
id: 'instance.action.repair',
defaultMessage: 'Repair',
},
starting: {
id: 'instance.action.starting',
defaultMessage: 'Starting...',
},
stopping: {
id: 'instance.action.stopping',
defaultMessage: 'Stopping...',
},
})
const props = withDefaults(
defineProps<{
instance: GameInstance
iconSrc?: string | null
isServerInstance?: boolean
showInstancePlayTime?: boolean
timePlayed?: number
playing?: boolean
loading?: boolean
stopping?: boolean
loadingServerPing?: boolean
playersOnline?: number
statusOnline?: boolean
recentPlays?: number
ping?: number
minecraftServer?: Labrinth.Projects.v3.Project['minecraft_server']
linkedProjectV3?: Labrinth.Projects.v3.Project
}>(),
{
iconSrc: null,
isServerInstance: false,
showInstancePlayTime: false,
timePlayed: 0,
playing: false,
loading: false,
stopping: false,
loadingServerPing: false,
playersOnline: undefined,
statusOnline: false,
recentPlays: undefined,
ping: undefined,
minecraftServer: undefined,
linkedProjectV3: undefined,
},
)
const emit = defineEmits<{
repair: []
stop: []
play: []
playServer: []
settings: []
openFolder: []
export: []
createShortcut: []
}>()
const installingStages = [
'installing',
'pack_installing',
'pack_installed',
'not_installed',
'minecraft_installing',
]
const { formatMessage } = useVIntl()
const isInstalling = computed(() => installingStages.includes(props.instance.install_stage))
const loaderDisplayName = computed(() => formatLoaderLabel(props.instance.loader) as ServerLoader)
const loaderLabel = computed(() =>
[loaderDisplayName.value, props.instance.loader_version].filter(Boolean).join(' '),
)
const playtimeLabel = computed(() => {
if (props.timePlayed <= 0) return formatMessage(messages.neverPlayed)
const hours = Math.floor(props.timePlayed / 3600)
if (hours >= 1) {
return `${hours} hour${hours > 1 ? 's' : ''}`
}
const minutes = Math.floor(props.timePlayed / 60)
if (minutes >= 1) {
return `${minutes} minute${minutes > 1 ? 's' : ''}`
}
const seconds = Math.floor(props.timePlayed)
return `${seconds} second${seconds > 1 ? 's' : ''}`
})
const serverPlayActions = computed<JoinedButtonAction[]>(() => [
{
id: 'join_server',
label: formatMessage(commonMessages.playButton),
icon: PlayIcon,
action: () => emit('playServer'),
},
{
id: 'launch_instance',
label: formatMessage(messages.launchInstance),
icon: PlayIcon,
action: () => emit('play'),
},
])
const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
{
id: 'open-folder',
label: formatMessage(messages.openFolder),
icon: FolderOpenIcon,
action: () => emit('openFolder'),
},
{
id: 'export-mrpack',
label: formatMessage(messages.exportModpack),
icon: PackageIcon,
action: () => emit('export'),
},
{
id: 'create-shortcut',
label: formatMessage(messages.createShortcut),
icon: ExternalIcon,
action: () => emit('createShortcut'),
},
])
</script>
@@ -0,0 +1,63 @@
<template>
<div class="flex items-center flex-wrap gap-2">
<template v-if="loadingServerPing">
<ServerOnlinePlayers
v-if="playersOnline !== undefined"
:online="playersOnline"
:status-online="statusOnline"
hide-label
/>
<ServerRecentPlays :recent-plays="recentPlays ?? 0" hide-label />
<div
v-if="
(playersOnline !== undefined || recentPlays !== undefined) &&
(minecraftServer?.region || ping)
"
class="w-1.5 h-1.5 rounded-full bg-surface-5"
></div>
<ServerPing v-if="ping" :ping="ping" />
</template>
<ServerRegion v-if="minecraftServer?.region" :region="minecraftServer?.region" />
<div v-if="minecraftServer?.region || ping" class="w-1.5 h-1.5 rounded-full bg-surface-5"></div>
<div v-if="linkedProjectV3" class="flex gap-1.5 items-center font-medium text-primary">
Linked to
<Avatar
:src="linkedProjectV3.icon_url"
:alt="linkedProjectV3.name"
:tint-by="instanceId"
size="24px"
/>
<router-link
:to="`/project/${linkedProjectV3.slug ?? linkedProjectV3.id}`"
class="hover:underline text-primary truncate"
>
{{ linkedProjectV3.name }}
</router-link>
</div>
</div>
</template>
<script setup lang="ts">
import type { Labrinth } from '@modrinth/api-client'
import {
Avatar,
ServerOnlinePlayers,
ServerPing,
ServerRecentPlays,
ServerRegion,
} from '@modrinth/ui'
defineProps<{
loadingServerPing?: boolean
playersOnline?: number
statusOnline?: boolean
recentPlays?: number
ping?: number
minecraftServer?: Labrinth.Projects.v3.Project['minecraft_server']
linkedProjectV3?: Labrinth.Projects.v3.Project
instanceId?: string
}>()
</script>
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Durchsuche {count} Welten..."
},
"app.modal.install-to-play.dont-install": {
"message": "Nicht Installieren"
},
"app.modal.install-to-play.header": {
"message": "Installieren zum Spielen"
},
"app.modal.install-to-play.install-anyway": {
"message": "Trotzdem Installieren"
},
"app.modal.install-to-play.install-button": {
"message": "Installieren"
},
"app.modal.install-to-play.invite-warning": {
"message": "Diese Einladung wurde von einem anderen Modrinth-Nutzer erstellt, nicht von Modrinth. Nimm nur Einladungen von Personen an, denen du vertraust."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# Mod} other {# Mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Eine Datei wird nur geprüft, wenn sie auf Modrinth veröffentlicht wird, unabhängig von ihrem Dateiformat (auch .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Geteilte Instanz"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Dieses Server-Modpack enthält Dateien, die nicht auf Modrinth veröffentlicht sind. Wir empfehlen dringend, nur Dateien aus vertrauenswürdigen Quellen zu installieren."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Warnung vor unbekannten Dateien"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Nicht erkannte Dateien"
},
"app.modal.install-to-play.view-contents": {
"message": "Inhalte ansehen"
},
"app.modal.update-to-play.header": {
"message": "Aktualisieren zum Spielen"
},
"app.modal.update-to-play.removed": {
"message": "Entfernt"
},
"app.modal.update-to-play.update-required-description": {
"message": "Eine aktualisierung zum spielen von {name} ist benötigt. Bitte aktualisiere auf die neuste Version um das Spiel zu starten."
},
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Durchsuche {count} Welten..."
},
"app.modal.install-to-play.dont-install": {
"message": "Nicht Installieren"
},
"app.modal.install-to-play.header": {
"message": "Installieren zum Spielen"
},
"app.modal.install-to-play.install-anyway": {
"message": "Trotzdem Installieren"
},
"app.modal.install-to-play.install-button": {
"message": "Installieren"
},
"app.modal.install-to-play.invite-warning": {
"message": "Diese Einladung wurde von einem anderen Modrinth-Nutzer erstellt, nicht von Modrinth. Nimm nur Einladungen von Personen an, denen du vertraust."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# Mod} other {# Mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Eine Datei wird nur geprüft, wenn sie auf Modrinth veröffentlicht wird, unabhängig von ihrem Dateiformat (auch .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Geteilte Instanz"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Dieses Server-Modpack enthält Dateien, die nicht auf Modrinth veröffentlicht sind. Wir empfehlen dringend, nur Dateien aus vertrauenswürdigen Quellen zu installieren."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Warnung vor unbekannten Dateien"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Nicht erkannte Dateien"
},
"app.modal.install-to-play.view-contents": {
"message": "Inhalte ansehen"
},
"app.modal.update-to-play.header": {
"message": "Aktualisieren zum Spielen"
},
"app.modal.update-to-play.removed": {
"message": "Entfernt"
},
"app.modal.update-to-play.update-required-description": {
"message": "Zum Spielen von {name} ist eine Aktualisierung erforderlich. Bitte aktualisiere auf die neueste Version, um das Spiel zu starten."
},
@@ -779,6 +779,33 @@
"friends.sign-in-to-add-friends": {
"message": "<link>Sign in to a Modrinth account</link> to add friends and see what they're playing!"
},
"instance.action.create-shortcut": {
"message": "Create shortcut"
},
"instance.action.export-modpack": {
"message": "Export modpack"
},
"instance.action.launch-instance": {
"message": "Launch instance"
},
"instance.action.more-actions": {
"message": "More actions"
},
"instance.action.open-folder": {
"message": "Open folder"
},
"instance.action.repair": {
"message": "Repair"
},
"instance.action.settings": {
"message": "Instance settings"
},
"instance.action.starting": {
"message": "Starting..."
},
"instance.action.stopping": {
"message": "Stopping..."
},
"instance.add-server.add-and-play": {
"message": "Add and play"
},
@@ -821,6 +848,9 @@
"instance.files.save-as": {
"message": "Save as..."
},
"instance.playtime.never-played": {
"message": "Never played"
},
"instance.server-modal.address": {
"message": "Address"
},
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Buscar en {count} mundos..."
},
"app.modal.install-to-play.dont-install": {
"message": "No instalar"
},
"app.modal.install-to-play.header": {
"message": "Instalar para jugar"
},
"app.modal.install-to-play.install-anyway": {
"message": "Instalar de todos modos"
},
"app.modal.install-to-play.install-button": {
"message": "Instalar"
},
"app.modal.install-to-play.invite-warning": {
"message": "Esta invitación la creó otro usuario de Modrinth, no Modrinth. Solo acepta invitaciones de personas en las que confíes."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# mod} other {# mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Un archivo solo se revisa si se publica en Modrinth, sin importar su formato (incluido el .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Instancia compartida"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Este modpack para servidor contiene archivos que no están publicados en Modrinth. Recomendamos encarecidamente instalar únicamente archivos de fuentes de confianza."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Advertencia sobre archivos desconocidos"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Archivos no reconocidos"
},
"app.modal.install-to-play.view-contents": {
"message": "Ver contenidos"
},
"app.modal.update-to-play.header": {
"message": "Actualizar para jugar"
},
"app.modal.update-to-play.removed": {
"message": "Eliminado"
},
"app.modal.update-to-play.update-required-description": {
"message": "Se requiere una actualización para jugar {name}. Por favor, actualiza a la versión más reciente para iniciar el juego."
},
+54 -6
View File
@@ -9,7 +9,7 @@
"message": "Téléchargements"
},
"app.action-bar.hide-more-running-instances": {
"message": "Masquer plus d'instances en exécution"
"message": "Masquer plus d'instances en cours d'exécution"
},
"app.action-bar.install.copied-details": {
"message": "Copié"
@@ -36,7 +36,7 @@
"message": "Annulé"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "Le nettoyage n'est pas terminé"
"message": "Le nettoyage n'a pas terminé"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "Impossible de télécharger les fichiers"
@@ -65,6 +65,27 @@
"app.action-bar.install.summary.java-setup-failed": {
"message": "L'installation de Java n'a pas pu se terminer"
},
"app.action-bar.install.summary.loader-setup-failed": {
"message": "La mise en place du loader a échoué"
},
"app.action-bar.install.summary.local-data-error": {
"message": "Impossible de mettre à jour les données locales"
},
"app.action-bar.install.summary.minecraft-setup-failed": {
"message": "La mise en place de Minecraft a échoué"
},
"app.action-bar.install.summary.modrinth-unreachable": {
"message": "Impossible d'atteindre les serveurs Modrinth"
},
"app.action-bar.install.summary.no-write-permission": {
"message": "Aucune permission d'écriture"
},
"app.action-bar.install.summary.pack-download-failed": {
"message": "Impossible de télécharger le pack"
},
"app.action-bar.install.summary.unexpected-error": {
"message": "Quelque chose s'est mal passé"
},
"app.action-bar.install.unknown-instance": {
"message": "Instance inconnue"
},
@@ -72,22 +93,22 @@
"message": "Installations"
},
"app.action-bar.make-primary-instance": {
"message": "Définir en tante qu'instance première"
"message": "Définir en tant qu'instance principale"
},
"app.action-bar.no-instances-running": {
"message": "Aucune instance en exécution"
"message": "Aucune instance en cours d'exécution"
},
"app.action-bar.offline": {
"message": "Hors ligne"
},
"app.action-bar.primary-instance": {
"message": "Instance première"
"message": "Instance principale"
},
"app.action-bar.reload-to-update": {
"message": "Recharger pour mettre à jour"
},
"app.action-bar.show-more-running-instances": {
"message": "Montrer plus d'instances en exécution"
"message": "Montrer plus d'instances en cours d'exécution"
},
"app.action-bar.stop-instance": {
"message": "Arrêter l'instance"
@@ -263,6 +284,9 @@
"app.install.phase.finalizing": {
"message": "Finalisation"
},
"app.install.phase.preparing_instance": {
"message": "En attente d'installation"
},
"app.install.phase.preparing_java": {
"message": "Préparation de Java"
},
@@ -401,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Rechercher {count} mondes..."
},
"app.modal.install-to-play.dont-install": {
"message": "Ne pas installer"
},
"app.modal.install-to-play.header": {
"message": "Installer pour jouer"
},
"app.modal.install-to-play.install-anyway": {
"message": "Installer quand même"
},
"app.modal.install-to-play.install-button": {
"message": "Installer"
},
"app.modal.install-to-play.invite-warning": {
"message": "Cette invitation a été crée par un autre utilisateur Modrinth, pas par Modrinth. N'acceptez seulement les invitations de personnes en qui vous avez confiance."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# mod} other {# mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Un fichier est seulement examiné s'il est publié sur Modrinth, peu importe son extension (y compris .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Instance partagée"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Ce modpack de serveur contient des fichiers qui ne sont pas publiés sur Modrinth. Nous recommandons fortement de seulement installer des fichiers de sources en qui vous avez confiance."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Avertissement de fichiers inconnus"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Fichiers non reconnus"
},
"app.modal.install-to-play.view-contents": {
"message": "Voir le contenu"
},
"app.modal.update-to-play.header": {
"message": "Mettre à jour pour jouer"
},
"app.modal.update-to-play.removed": {
"message": "Supprimé"
},
"app.modal.update-to-play.update-required-description": {
"message": "Une mise à jour est requise pour jouer à {name}. Veuillez mettre à jour à la dernière version pour lancer le jeu."
},
+33 -9
View File
@@ -51,7 +51,7 @@
"message": "A letöltés nem sikerült"
},
"app.action-bar.install.summary.instance-not-found": {
"message": "A példány nem található"
"message": "A játékprofil nem található"
},
"app.action-bar.install.summary.invalid-file-path": {
"message": "A fájl elérési útja érvénytelen"
@@ -87,7 +87,7 @@
"message": "Valami hiba történt"
},
"app.action-bar.install.unknown-instance": {
"message": "Ismeretlen profil"
"message": "Ismeretlen játékprofil"
},
"app.action-bar.installs": {
"message": "Telepítések"
@@ -240,7 +240,7 @@
"message": "Modcsomagok"
},
"app.browse.server-instance-content-warning": {
"message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverpéldány tartalmát."
"message": "A tartalom hozzáadása ronthatja a kompatibilitást a szerverhez való csatlakozáskor. A hozzáadott tartalom elveszik, ha frissíted a szerverprofil tartalmát."
},
"app.browse.server.installing": {
"message": "Letöltés"
@@ -291,16 +291,16 @@
"message": "Java előkészítése"
},
"app.install.phase.preparing_java.downloading": {
"message": "Java verzió {version} letöltése"
"message": "A Java {version} letöltése..."
},
"app.install.phase.preparing_java.extracting": {
"message": "Java verzió {version} kibontása"
"message": "A Java {version} kibontása..."
},
"app.install.phase.preparing_java.fetching-metadata": {
"message": "Java verzió ellőkészítése {version}"
"message": "A Java {version} előkészítése..."
},
"app.install.phase.preparing_java.resolving": {
"message": "Java verzió {version} előkészítése"
"message": "A Java {version} előkészítése..."
},
"app.install.phase.preparing_java.validating": {
"message": "A Java {version} ellenőrzése"
@@ -324,7 +324,7 @@
"message": "Betöltő folyamatok futtatása"
},
"app.instance.confirm-delete.admonition-body": {
"message": "Az profilodhoz tartozó összes adat véglegesen törlődik, beleértve a világokat, a beállításokat és az összes telepített tartalmat."
"message": "A profilodhoz tartozó összes adat véglegesen törlődik, beleértve a világokat, a beállításokat és az összes telepített tartalmat."
},
"app.instance.confirm-delete.admonition-header": {
"message": "Ezt a műveletet nem lehet visszavonni"
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Keresés {count} világ között..."
},
"app.modal.install-to-play.dont-install": {
"message": "Ne töltse le"
},
"app.modal.install-to-play.header": {
"message": "Telepítés a játékhoz"
},
"app.modal.install-to-play.install-anyway": {
"message": "Telepítés mindenképpen"
},
"app.modal.install-to-play.install-button": {
"message": "Telepítés"
},
"app.modal.install-to-play.invite-warning": {
"message": "Ezt a meghívót nem a Modrinth, hanem egy másik Modrinth-felhasználó hozta létre. Csak olyan személyektől fogadd el a meghívásokat, akikben megbízol."
},
"app.modal.install-to-play.mod-count": {
"message": "{count} mod"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Egy fájlt csak akkor vizsgálnak meg, ha azt a Modrinth-en közzétették, függetlenül a fájlformátumtól (beleértve a .mrpack formátumot is)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Megosztott profil"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Ez a szerver-modpack olyan fájlokat tartalmaz, amelyek nem szerepelnek a Modrinth oldalon. Határozottan javasoljuk, hogy kizárólag olyan forrásokból telepíts fájlokat, amelyekben megbízol."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Figyelmeztetés ismeretlen fájlokról"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Felismerhetetlen fájlok"
},
"app.modal.install-to-play.view-contents": {
"message": "Tartalom megtekintése"
},
"app.modal.update-to-play.header": {
"message": "Frissítsd a játékhoz"
},
"app.modal.update-to-play.removed": {
"message": "Törölve"
},
"app.modal.update-to-play.update-required-description": {
"message": "Frissítés szükséges ehhez: {name}. Kérlek, frissíts a legújabb verzióra a játék elindításához."
},
@@ -456,7 +480,7 @@
"message": "Vissza a böngészéshez"
},
"app.project.install-context.install-content-to-instance": {
"message": "Tartalom telepítése a példányba"
"message": "Tartalom telepítése a profilba"
},
"app.project.version.all-versions": {
"message": "Összes verzió"
@@ -422,24 +422,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Cerca tra {count} mondi..."
},
"app.modal.install-to-play.dont-install": {
"message": "Non installare"
},
"app.modal.install-to-play.header": {
"message": "Installa per continuare"
},
"app.modal.install-to-play.install-anyway": {
"message": "Installa comunque"
},
"app.modal.install-to-play.install-button": {
"message": "Installa"
},
"app.modal.install-to-play.invite-warning": {
"message": "Questo invito è stato creato da un utente e non da Modrinth. Accetta solo gli inviti da persone fidate."
},
"app.modal.install-to-play.mod-count": {
"message": "{count} mod"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Solo i file pubblicati su Modrinth vengono esaminati, qualunque sia il loro formato (.mrpack inclusi)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Istanza condivisa"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Questo pacchetto contiene dei file che non sono su Modrinth. Consigliamo di installare file solo da fonti attendibili."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "File sconosciuti"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "File non riconosciuti"
},
"app.modal.install-to-play.view-contents": {
"message": "Mostra contenuti"
},
"app.modal.update-to-play.header": {
"message": "Aggiorna per continuare"
},
"app.modal.update-to-play.removed": {
"message": "Rimosso"
},
"app.modal.update-to-play.update-required-description": {
"message": "{name} richiede degli aggiornamenti. Installa l'ultima versione per poter giocare."
},
@@ -143,6 +143,12 @@
"app.appearance-settings.show-play-time.title": {
"message": "プレイ時間を表示"
},
"app.appearance-settings.skip-non-essential-warnings.description": {
"message": "Modパックの重複インストール、通常のコンテンツ削除、一括更新、Modパックのリンク解除、修復の促しなど、リスクの低い確認画面は自動的にスキップされます。危険な警告は引き続き表示されます。"
},
"app.appearance-settings.skip-non-essential-warnings.title": {
"message": "重要でない警告をスキップ"
},
"app.appearance-settings.toggle-sidebar.description": {
"message": "サイドバーの表示/非表示を切り替える機能を有効にします。"
},
@@ -173,12 +179,18 @@
"app.browse.already-added": {
"message": "すでに追加済み"
},
"app.browse.back-to-instance": {
"message": "インスタンスに戻る"
},
"app.browse.discover-content": {
"message": "コンテンツを探す"
},
"app.browse.discover-servers": {
"message": "サーバーを探す"
},
"app.browse.hide-added-servers": {
"message": "既に追加済みのサーバーを非表示にする"
},
"app.browse.project-type.modpacks": {
"message": "Modパック"
},
+109 -1
View File
@@ -11,6 +11,12 @@
"app.action-bar.hide-more-running-instances": {
"message": "실행 중인 인스턴스 숨기기"
},
"app.action-bar.install.copied-details": {
"message": "복사됨"
},
"app.action-bar.install.copy-details": {
"message": "세부 정보 복사"
},
"app.action-bar.install.dismiss": {
"message": "무시"
},
@@ -20,6 +26,66 @@
"app.action-bar.install.retry": {
"message": "재시도"
},
"app.action-bar.install.summary.app-closing": {
"message": "앱이 종료되어 취소되었습니다"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "모드팩을 읽을 수 없음"
},
"app.action-bar.install.summary.canceled": {
"message": "취소됨"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "파일 정리가 완료되지 않았습니다"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "파일을 다운로드할 수 없습니다"
},
"app.action-bar.install.summary.corrupt-download": {
"message": "다운로드한 파일이 손상되었습니다"
},
"app.action-bar.install.summary.could-not-save-files": {
"message": "파일을 저장할 수 없습니다"
},
"app.action-bar.install.summary.download-failed": {
"message": "다운로드를 완료할 수 없습니다"
},
"app.action-bar.install.summary.instance-not-found": {
"message": "인스턴스를 찾을 수 없습니다"
},
"app.action-bar.install.summary.invalid-file-path": {
"message": "파일 경로가 올바르지 않습니다"
},
"app.action-bar.install.summary.invalid-modpack": {
"message": "모드팩 데이터가 올바르지 않습니다"
},
"app.action-bar.install.summary.invalid-modpack-files": {
"message": "모드팩 파일이 올바르지 않은 메타데이터를 가지고 있습니다"
},
"app.action-bar.install.summary.java-setup-failed": {
"message": "Java 설치를 완료할 수 없습니다"
},
"app.action-bar.install.summary.loader-setup-failed": {
"message": "로더 설치에 실패했습니다"
},
"app.action-bar.install.summary.local-data-error": {
"message": "로컬 데이터를 업데이트할 수 없습니다"
},
"app.action-bar.install.summary.minecraft-setup-failed": {
"message": "Minecraft 설치에 실패했습니다"
},
"app.action-bar.install.summary.modrinth-unreachable": {
"message": "Modrinth에 연결할 수 없습니다"
},
"app.action-bar.install.summary.no-write-permission": {
"message": "쓰기 권한이 없습니다"
},
"app.action-bar.install.summary.pack-download-failed": {
"message": "팩을 다운로드할 수 없습니다"
},
"app.action-bar.install.summary.unexpected-error": {
"message": "무언가 잘못되었습니다"
},
"app.action-bar.install.unknown-instance": {
"message": "알 수 없는 인스턴스"
},
@@ -218,6 +284,9 @@
"app.install.phase.finalizing": {
"message": "마무리 중"
},
"app.install.phase.preparing_instance": {
"message": "설치 대기열에 추가됨"
},
"app.install.phase.preparing_java": {
"message": "Java 준비 중"
},
@@ -356,36 +425,75 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "{count}개의 세계 검색..."
},
"app.modal.install-to-play.dont-install": {
"message": "설치하지 않음"
},
"app.modal.install-to-play.header": {
"message": "설치하고 플레이"
},
"app.modal.install-to-play.install-anyway": {
"message": "무시하고 설치"
},
"app.modal.install-to-play.install-button": {
"message": "설치"
},
"app.modal.install-to-play.invite-warning": {
"message": "이 초대장은 다른 Modrinth 사용자가 생성했으며, Modrinth에서 생성하지 않았습니다. 신뢰할 수 있는 초대장만 수락하십시오."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {모드 #개} other {모드 #개}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "모든 파일은 형식(.mrpack 포함)에 무관하게 Modrinth에 게시되어야만 검수를 거칩니다."
},
"app.modal.install-to-play.shared-instance": {
"message": "인스턴스 공유됨"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "이 서버의 모드팩은 Modrinth에 게시되지 않은 파일을 포함하고 있습니다. 신뢰할 수 있는 출처의 파일만 설치하는 것을 강력히 권장합니다."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "출처를 알 수 없는 파일"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "확인되지 않은 파일"
},
"app.modal.install-to-play.view-contents": {
"message": "구성 요소 보기"
},
"app.modal.update-to-play.header": {
"message": "업데이트하고 플레이"
},
"app.modal.update-to-play.removed": {
"message": "제거됨"
},
"app.modal.update-to-play.update-required-description": {
"message": "{name}을(를) 플레이하려면 업데이트가 필요합니다. 게임을 실행하려면 최신 버전으로 업데이트해 주세요."
},
"app.project.install-button.already-installed": {
"message": "이미 설치되어 있음"
},
"app.project.install-button.switch-version": {
"message": "버전 변경"
},
"app.project.install-context.back-to-browse": {
"message": "탐색으로 돌아가기"
},
"app.project.install-context.install-content-to-instance": {
"message": "인스턴스에 콘텐츠 설치"
},
"app.project.version.all-versions": {
"message": "모든 버전"
},
"app.project.version.download-in-browser": {
"message": "브라우저에서 다운로드"
},
"app.project.version.installing": {
"message": "설치 중"
},
"app.project.versions.already-installed": {
"message": "이미 설치됨"
},
"app.settings.developer-mode-enabled": {
"message": "개발자 모드가 활성화되었습니다."
},
@@ -579,7 +687,7 @@
"message": "다운로드 완료"
},
"app.update-popup.reload": {
"message": "업데이트하려면 다시 로드"
"message": "새로고침하여 업데이트"
},
"app.update-popup.title": {
"message": "업데이트 가능"
+232 -7
View File
@@ -11,6 +11,87 @@
"app.action-bar.hide-more-running-instances": {
"message": "Verberg meer actieve instanties"
},
"app.action-bar.install.copied-details": {
"message": "Gekopieerd"
},
"app.action-bar.install.copy-details": {
"message": "Details kopiëren"
},
"app.action-bar.install.dismiss": {
"message": "Sluiten"
},
"app.action-bar.install.open-instance": {
"message": "Instantie openen"
},
"app.action-bar.install.retry": {
"message": "Opnieuw proberen"
},
"app.action-bar.install.summary.app-closing": {
"message": "Geannuleerd vanwege het sluiten van de app"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "Modpack kon niet gelezen worden"
},
"app.action-bar.install.summary.canceled": {
"message": "Geannuleerd"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "Opschonen is niet voltooid"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "Bestanden konden niet gedownload worden"
},
"app.action-bar.install.summary.corrupt-download": {
"message": "Gedownloade bestand is beschadigd"
},
"app.action-bar.install.summary.could-not-save-files": {
"message": "Bestanden konden niet opgeslagen worden"
},
"app.action-bar.install.summary.download-failed": {
"message": "Downloaden kon niet worden voltooid"
},
"app.action-bar.install.summary.instance-not-found": {
"message": "Instantie kon niet gevonden worden"
},
"app.action-bar.install.summary.invalid-file-path": {
"message": "Bestandspad is ongeldig"
},
"app.action-bar.install.summary.invalid-modpack": {
"message": "Modpack-gegevens ongeldig"
},
"app.action-bar.install.summary.invalid-modpack-files": {
"message": "Modpack-bestanden bevatten ongeldige metagegevens"
},
"app.action-bar.install.summary.java-setup-failed": {
"message": "Installatie van Java kon niet worden voltooid"
},
"app.action-bar.install.summary.loader-setup-failed": {
"message": "Instellen van loader is mislukt"
},
"app.action-bar.install.summary.local-data-error": {
"message": "Lokale gegevens konden niet bijgewerkt worden"
},
"app.action-bar.install.summary.minecraft-setup-failed": {
"message": "Instellen van Minecraft is mislukt"
},
"app.action-bar.install.summary.modrinth-unreachable": {
"message": "Modrinth kon niet bereikt worden"
},
"app.action-bar.install.summary.no-write-permission": {
"message": "Geen schrijfrechten"
},
"app.action-bar.install.summary.pack-download-failed": {
"message": "Pack kon niet gedownload worden"
},
"app.action-bar.install.summary.unexpected-error": {
"message": "Er is iets misgegaan"
},
"app.action-bar.install.unknown-instance": {
"message": "Onbekende instantie"
},
"app.action-bar.installs": {
"message": "Installaties"
},
"app.action-bar.make-primary-instance": {
"message": "Maak primaire instantie"
},
@@ -101,6 +182,12 @@
"app.appearance-settings.show-play-time.title": {
"message": "Speeltijd laten zien"
},
"app.appearance-settings.skip-non-essential-warnings.description": {
"message": "Bevestigingen met een laag risico, zoals het installeren van dubbele modpacks, het verwijderen van normale inhoud, bulkupdates, het ontkoppelen van modpacks en reparatieverzoeken, worden automatisch overgeslagen. Waarschuwingen voor gevaarlijke dingen worden nog steeds weergegeven."
},
"app.appearance-settings.skip-non-essential-warnings.title": {
"message": "Niet-essentiële waarschuwingen overslaan"
},
"app.appearance-settings.toggle-sidebar.description": {
"message": "Schakelt de mogelijkheid om de zijbalk in- of uit te schakelen in."
},
@@ -141,16 +228,19 @@
"message": "Terug naar instantie"
},
"app.browse.discover-content": {
"message": "Ontdek content"
"message": "Inhoud ontdekken"
},
"app.browse.discover-servers": {
"message": "Ontdek servers"
},
"app.browse.hide-added-servers": {
"message": "Al toegevoegde servers verbergen"
},
"app.browse.project-type.modpacks": {
"message": "Modpacks"
},
"app.browse.server-instance-content-warning": {
"message": "Het toevoegen van content kan de compatibiliteit verbreken bij het verbinden met de server. Alle toegevoegde inhoud gaat ook verloren wanneer u de content van de serverinstantie bijwerkt."
"message": "Het toevoegen van inhoud kan de compatibiliteit verstoren bij het verbinden met de server. Eventuele toegevoegde inhoud gaat bovendien verloren wanneer je de inhoud van de serverinstantie bijwerkt."
},
"app.browse.server.installing": {
"message": "Installeren"
@@ -167,6 +257,9 @@
"app.export-modal.header": {
"message": "Exporteer modpack"
},
"app.export-modal.modpack-name-label": {
"message": "Naam van modpack"
},
"app.export-modal.modpack-name-placeholder": {
"message": "Modpack naam"
},
@@ -176,8 +269,62 @@
"app.export-modal.version-number-placeholder": {
"message": "1.0.0"
},
"app.install.phase.downloading_content": {
"message": "Inhoud aan het downloaden"
},
"app.install.phase.downloading_minecraft": {
"message": "Minecraft aan het downloaden"
},
"app.install.phase.downloading_pack_file": {
"message": "Pakketbestand aan het downloaden"
},
"app.install.phase.extracting_overrides": {
"message": "Overschrijvingen eruit halen"
},
"app.install.phase.finalizing": {
"message": "Aan het afronden"
},
"app.install.phase.preparing_instance": {
"message": "In de wachtrij voor installatie"
},
"app.install.phase.preparing_java": {
"message": "Java aan het voorbereiden"
},
"app.install.phase.preparing_java.downloading": {
"message": "Java {version} aan het downloaden"
},
"app.install.phase.preparing_java.extracting": {
"message": "Java {version} aan het uitpakken"
},
"app.install.phase.preparing_java.fetching-metadata": {
"message": "Java {version} aan het ophalen"
},
"app.install.phase.preparing_java.resolving": {
"message": "Java {version} aan het voorbereiden"
},
"app.install.phase.preparing_java.validating": {
"message": "Java {version} aan het valideren"
},
"app.install.phase.reading_pack_manifest": {
"message": "Paketmanifest aan het lezen"
},
"app.install.phase.resolving_loader": {
"message": "Loader wordt bepaald"
},
"app.install.phase.resolving_minecraft": {
"message": "Minecraft wordt bepaald"
},
"app.install.phase.resolving_pack": {
"message": "Inhoud aan het bepalen"
},
"app.install.phase.rolling_back": {
"message": "Aan het terugdraaien"
},
"app.install.phase.running_loader_processors": {
"message": "Loader-processors aan het uitvoeren"
},
"app.instance.confirm-delete.admonition-body": {
"message": "Alle data van je instantie zal permanent verwijderd worden, inclusief al je werelden, voorkeuren, en alle geïnstalleerde content."
"message": "Alle gegevens van je instantie worden definitief verwijderd, inclusief je werelden, configuraties en alle geïnstalleerde inhoud."
},
"app.instance.confirm-delete.admonition-header": {
"message": "Deze actie kan niet ongedaan gemaakt worden"
@@ -200,6 +347,15 @@
"app.instance.modpack-already-installed.instance": {
"message": "Instantie"
},
"app.instance.mods.bulk-update.downloading-projects": {
"message": "{current, number}/{total, number} projecten aan het downloaden..."
},
"app.instance.mods.bulk-update.finishing": {
"message": "Update aan het afronden..."
},
"app.instance.mods.bulk-update.resolving-versions": {
"message": "Versies worden bepaald..."
},
"app.instance.mods.content-type-project": {
"message": "project"
},
@@ -224,6 +380,18 @@
"app.instance.worlds.browse-servers": {
"message": "Zoek servers"
},
"app.instance.worlds.delete-world-modal.delete-button": {
"message": "Wereld verwijderen"
},
"app.instance.worlds.delete-world-modal.title": {
"message": "Wereld verwijderen"
},
"app.instance.worlds.delete-world-modal.warning-body": {
"message": "Deze wereld wordt definitief uit deze instantie verwijderd. Deze actie kan niet ongedaan worden gemaakt."
},
"app.instance.worlds.delete-world-modal.warning-header": {
"message": "{name} verwijderen"
},
"app.instance.worlds.filter-modded": {
"message": "Gemod"
},
@@ -242,38 +410,89 @@
"app.instance.worlds.no-worlds-heading": {
"message": "Noch servers noch werelden toegevoegd"
},
"app.instance.worlds.remove-server-modal.remove-button": {
"message": "Server verwijderen"
},
"app.instance.worlds.remove-server-modal.title": {
"message": "Server verwijderen"
},
"app.instance.worlds.remove-server-modal.warning-body": {
"message": "Deze server wordt verwijderd uit je serverlijst en uit de serverlijst in het spel. Je kunt hem later weer toevoegen als je het adres weet."
},
"app.instance.worlds.remove-server-modal.warning-header": {
"message": "{name} verwijderen"
},
"app.instance.worlds.search-worlds-placeholder": {
"message": "Zoek werelden"
},
"app.modal.install-to-play.dont-install": {
"message": "Niet installeren"
},
"app.modal.install-to-play.header": {
"message": "Installeer om te spelen"
},
"app.modal.install-to-play.install-anyway": {
"message": "Toch installeren"
},
"app.modal.install-to-play.install-button": {
"message": "Installeer"
},
"app.modal.install-to-play.invite-warning": {
"message": "Deze uitnodiging is aangemaakt door een andere Modrinth-gebruiker, niet door Modrinth zelf. Accepteer alleen uitnodigingen van mensen die je vertrouwt."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural,one {# mod}other {# mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Een bestand wordt alleen beoordeeld als het op Modrinth wordt gepubliceerd, ongeacht het bestandsformaat (inclusief .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Gedeelde instantie"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Dit server-modpack bevat bestanden die niet op Modrinth zijn gepubliceerd. We raden je ten zeerste aan om alleen bestanden te installeren uit bronnen die je vertrouwt."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Waarschuwing voor onbekende bestanden"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Onbekende bestanden"
},
"app.modal.install-to-play.view-contents": {
"message": "Toon content"
"message": "Inhoud bekijken"
},
"app.modal.update-to-play.header": {
"message": "Update om te spelen"
},
"app.modal.update-to-play.removed": {
"message": "Verwijderde"
},
"app.modal.update-to-play.update-required-description": {
"message": "Een update is vereist om {name} te spelen. Update naar de laatste versie om het spel te starten."
},
"app.project.install-button.already-installed": {
"message": "Dit project is al geïnstalleerd"
},
"app.project.install-button.switch-version": {
"message": "Versie wijzigen"
},
"app.project.install-context.back-to-browse": {
"message": "Terug naar Ontdekken"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installeer content naar instantie"
"message": "Inhoud op instantie installeren"
},
"app.project.version.all-versions": {
"message": "Alle versies"
},
"app.project.version.download-in-browser": {
"message": "Downloaden in de browser"
},
"app.project.version.installing": {
"message": "Wordt geïnstalleerd"
},
"app.project.versions.already-installed": {
"message": "Al geïnstalleerd"
},
"app.settings.developer-mode-enabled": {
"message": "Ontwikkelaarsmodus ingeschakeld."
@@ -390,11 +609,14 @@
"message": "Je skinvolgorde kon niet worden opgeslagen."
},
"app.skins.reorder-error.title": {
"message": "Het herschikken van skins is mislukt."
"message": "Herschikken van skins is mislukt"
},
"app.skins.section.builders-and-biomes": {
"message": "Builders & Biomes"
},
"app.skins.section.chaos-cubed": {
"message": "Chaos Cubed"
},
"app.skins.section.chase-the-skies": {
"message": "Chase the Skies"
},
@@ -621,7 +843,7 @@
"message": "Verwijder instantie"
},
"instance.settings.tabs.general.delete.description": {
"message": "Verwijdert permanent een instantie van je apparaat, inclusief je werelden, instellingen en alle geïnstalleerde inhoud. Wees voorzichtig, zodra je een instantie verwijdert, is het niet meer mogelijk om deze te herstellen."
"message": "Hiermee wordt een instantie definitief van je apparaat verwijderd, inclusief je werelden, instellingen en alle geïnstalleerde inhoud. Wees voorzichtig, want zodra je een instantie hebt verwijderd, kun je deze niet meer herstellen."
},
"instance.settings.tabs.general.deleting.button": {
"message": "Verwijderen..."
@@ -812,6 +1034,9 @@
"instance.worlds.copy_address": {
"message": "Kopieer adres"
},
"instance.worlds.create_shortcut": {
"message": "Snelkoppeling maken"
},
"instance.worlds.dont_show_on_home": {
"message": "Niet tonen op de startpagina"
},
@@ -422,24 +422,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Szukaj wśród {count} światów..."
},
"app.modal.install-to-play.dont-install": {
"message": "Nie instaluj"
},
"app.modal.install-to-play.header": {
"message": "Zainstaluj, aby grać"
},
"app.modal.install-to-play.install-anyway": {
"message": "Instaluj mimo to"
},
"app.modal.install-to-play.install-button": {
"message": "Zainstaluj"
},
"app.modal.install-to-play.invite-warning": {
"message": "To zaproszenie zostało utworzone przez innego użytkownika Modrinth, nie przez firmę Modrinth. Tylko akceptuj zaproszenia od osób, którym ufasz."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# mod} few {# mody} other {# modów}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Plik jest sprawdzony tylko, jeżeli został opublikowany na Modrinth, niezależnie od jego formatu (w tym pliki .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Wspólna instancja"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Ta serwerowa paczka modów zawiera pliki, które nie zostały opublikowane na Modrinth. Zalecamy instalowanie plików tylko ze źródeł, którym ufasz."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Ostrzeżenie o nieznanych plikach"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Nieznane plki"
},
"app.modal.install-to-play.view-contents": {
"message": "Pokaż zawartość"
},
"app.modal.update-to-play.header": {
"message": "Zaktualizuj, by grać"
},
"app.modal.update-to-play.removed": {
"message": "Usunięto"
},
"app.modal.update-to-play.update-required-description": {
"message": "Aktualizacja jest wymagana, aby grać w {name}. Proszę zaktualizować do najnowszej wersji, aby uruchomić grę."
},
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Buscar {count} mundos..."
},
"app.modal.install-to-play.dont-install": {
"message": "Não instalar"
},
"app.modal.install-to-play.header": {
"message": "Instale para jogar"
},
"app.modal.install-to-play.install-anyway": {
"message": "Instalar mesmo assim"
},
"app.modal.install-to-play.install-button": {
"message": "Instalar"
},
"app.modal.install-to-play.invite-warning": {
"message": "Este convite foi criado por outro usuário do Modrinth, não pelo próprio Modrinth. Só aceite convites de pessoas que você confia."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, =0 {Nenhum mod} one {# mod} other {# mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Um arquivo só é revisado se for publicado no Modrinth, independente do formato de arquivo (incluindo .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Instância compartilhada"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Este pacote de mods do servidor contém arquivos não publicados no Modrinth. Recomendamos fortemente a instalar apenas arquivos de fontes que você confia."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Aviso de arquivos desconhecidos"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Arquivos não reconhecidos"
},
"app.modal.install-to-play.view-contents": {
"message": "Ver conteúdo"
},
"app.modal.update-to-play.header": {
"message": "Atualize para jogar"
},
"app.modal.update-to-play.removed": {
"message": "Removido"
},
"app.modal.update-to-play.update-required-description": {
"message": "Uma atualização é necessária para jogar {name}. Atualize para a versão mais recente para iniciar o jogo."
},
@@ -419,24 +419,48 @@
"app.instance.worlds.remove-server-modal.warning-header": {
"message": "Удаление {name}"
},
"app.modal.install-to-play.dont-install": {
"message": "Не устанавливать"
},
"app.modal.install-to-play.header": {
"message": "Установка перед запуском"
},
"app.modal.install-to-play.install-anyway": {
"message": "Всё равно установить"
},
"app.modal.install-to-play.install-button": {
"message": "Установить"
},
"app.modal.install-to-play.invite-warning": {
"message": "Это приглашение создано другим пользователем Modrinth. Принимайте приглашения только от тех, кому доверяете."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# мод} few {# мода} other {# модов}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Файл проверяется только если он опубликован на Modrinth, независимо от его формата (включая .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Сборка"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Сборка этого сервера содержит файлы, которые не опубликованы на Modrinth. Рекомендуется скачивать файлы только из надёжных источников."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Предупреждение о неизвестных файлах"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Нераспознанные файлы"
},
"app.modal.install-to-play.view-contents": {
"message": "Посмотреть содержимое"
},
"app.modal.update-to-play.header": {
"message": "Обновление перед запуском"
},
"app.modal.update-to-play.removed": {
"message": "Удалён"
},
"app.modal.update-to-play.update-required-description": {
"message": "Обновите {name} до последней версии, чтобы запустить игру."
},
@@ -29,12 +29,63 @@
"app.action-bar.install.summary.app-closing": {
"message": "Otkazano zbog zatvaranja aplikacije"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "Nije moglo pročitati modpack"
},
"app.action-bar.install.summary.canceled": {
"message": "Otkazano"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "Čišćenje nije završeno"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "Nije bilo moguće instalirati datoteke"
},
"app.action-bar.install.summary.corrupt-download": {
"message": "Preuzeta datoteka je oštećena"
},
"app.action-bar.install.summary.could-not-save-files": {
"message": "Nije bilo moguće spremiti datoteke"
},
"app.action-bar.install.summary.download-failed": {
"message": "Preuzimanje nije završeno"
},
"app.action-bar.install.summary.instance-not-found": {
"message": "Instanca nije pronađena"
},
"app.action-bar.install.summary.invalid-file-path": {
"message": "Put do datoteke nije ispravan"
},
"app.action-bar.install.summary.invalid-modpack": {
"message": "Podaci modpaka su nevažeći"
},
"app.action-bar.install.summary.invalid-modpack-files": {
"message": "Datoteke modpaka sadrže nevažeće metapodatke"
},
"app.action-bar.install.summary.java-setup-failed": {
"message": "Podešavanje Jave nije moglo biti završeno"
},
"app.action-bar.install.summary.loader-setup-failed": {
"message": "Podešavanje učitavača nije uspelo"
},
"app.action-bar.install.summary.local-data-error": {
"message": "Nije bilo moguće ažurirati lokalne podatke"
},
"app.action-bar.install.summary.minecraft-setup-failed": {
"message": "Podešavanje Minecrafta nije uspelo"
},
"app.action-bar.install.summary.modrinth-unreachable": {
"message": "Nije bilo moguće povezati se sa Modrinth-om"
},
"app.action-bar.install.summary.no-write-permission": {
"message": "Nema dozvole za pisanje"
},
"app.action-bar.install.summary.pack-download-failed": {
"message": "Nije bilo moguće instalirati datoteku"
},
"app.action-bar.install.summary.unexpected-error": {
"message": "Nešto je pošlo po zlu"
},
"app.action-bar.install.unknown-instance": {
"message": "Nepoznata instanca"
},
@@ -233,6 +284,9 @@
"app.install.phase.finalizing": {
"message": "Finaliziranje"
},
"app.install.phase.preparing_instance": {
"message": "Na čekanju za instalaciju"
},
"app.install.phase.preparing_java": {
"message": "Pripremanje Jave"
},
@@ -371,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Pretraži {count} svetova..."
},
"app.modal.install-to-play.dont-install": {
"message": "Ne instaliraj"
},
"app.modal.install-to-play.header": {
"message": "Instaliraj da bi igrao"
},
"app.modal.install-to-play.install-anyway": {
"message": "Svejedno instaliraj"
},
"app.modal.install-to-play.install-button": {
"message": "Instaliraj"
},
"app.modal.install-to-play.invite-warning": {
"message": "Ovu pozivnicu je kreirao drugi korisnik Modrintha, a ne sam Modrinth. Prihvataj pozivnice samo od osoba kojima veruješ."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# mod} other {# modova}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Datoteka se pregleda samo ako je postavljena na Modrinth, bez obzira na njen format (uključujući .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Deljena instanca"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Ovaj modpack servera sadrži datoteke koje nisu postavljene na Modrinth-u. Preporučujemo da instaliraš datoteke samo iz izvora kojima veruješ."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Upozorenje nepoznatih datoteka"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Nepoznate datoteke"
},
"app.modal.install-to-play.view-contents": {
"message": "Pogledaj sadržaj"
},
"app.modal.update-to-play.header": {
"message": "Ažuriraj da bi igrao"
},
"app.modal.update-to-play.removed": {
"message": "Smaknuto"
},
"app.modal.update-to-play.update-required-description": {
"message": "Potrebno je ažuriranje da biste igrali {name}. Molimo te da ažuriraš na najnoviju verziju da bi pokrenuo igru."
},
+22 -13
View File
@@ -407,9 +407,15 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "Sök {count} världar..."
},
"app.modal.install-to-play.dont-install": {
"message": "Installera inte"
},
"app.modal.install-to-play.header": {
"message": "Installera för att spela"
},
"app.modal.install-to-play.install-anyway": {
"message": "Installera andå"
},
"app.modal.install-to-play.install-button": {
"message": "Installera"
},
@@ -425,6 +431,9 @@
"app.modal.update-to-play.header": {
"message": "Uppdatera för att spela"
},
"app.modal.update-to-play.removed": {
"message": "Tog bort"
},
"app.modal.update-to-play.update-required-description": {
"message": "En uppdatering krävs för att spela {name}. Vänligen uppdatera till senaste version för att starta spelet."
},
@@ -615,7 +624,7 @@
"message": "Logga in"
},
"app.skins.sign-in.description": {
"message": "Snälla logga in din Minecraft konto att använda hud hantering förmågor i Modrinth appen."
"message": "Vänligen logga in på ditt Minecraft-konto för att använda utseendehanteringfunktioner i Modrinth appen."
},
"app.skins.sign-in.rinthbot-alt": {
"message": "Exalterad Modrinth bot"
@@ -657,7 +666,7 @@
"message": "Version {version} har installerats!"
},
"app.world.server-modal.placeholder-address": {
"message": "example.modrinth.gg"
"message": "exempel.modrinth.gg"
},
"app.world.server-modal.select-an-option": {
"message": "Välj ett alternativ"
@@ -732,7 +741,7 @@
"message": "Sök efter vänner..."
},
"friends.section.heading": {
"message": "{title}: {count}"
"message": "{title} - {count}"
},
"friends.sign-in-to-add-friends": {
"message": "<link>Logga in på ett Modrinth-konto</link> för att lägga till vänner och se vad de spelar!"
@@ -852,19 +861,19 @@
"message": "Alfa"
},
"instance.settings.tabs.general.update-channel.alpha.description": {
"message": "Utgåvor, beta och alfa versioner visas som tillgängliga uppdateringar."
"message": "Release-, beta- och alfaversioner kommer visas som tillgängliga uppdateringar."
},
"instance.settings.tabs.general.update-channel.beta": {
"message": "Beta"
},
"instance.settings.tabs.general.update-channel.beta.description": {
"message": "Utgåvor och beta versioner visas som tillgängliga uppdateringar."
"message": "Release- och betaversioner kommer visas som tillgängliga uppdateringar."
},
"instance.settings.tabs.general.update-channel.release": {
"message": "Utgåva"
"message": "Release"
},
"instance.settings.tabs.general.update-channel.release.description": {
"message": "Endast utgivna versioner visas som tillgängliga uppdateringar."
"message": "Endast realeseversioner kommer visas som tillgängliga uppdateringar."
},
"instance.settings.tabs.general.update-channel.select": {
"message": "Välj uppdateringskanal"
@@ -930,10 +939,10 @@
"message": "Anpassad minnestilldelning"
},
"instance.settings.tabs.java.enter-environment-variables": {
"message": "Skriv in miljövariabler..."
"message": "Ange miljövariabler..."
},
"instance.settings.tabs.java.enter-java-arguments": {
"message": "Skriv in Java-argument..."
"message": "Ange Java-argument..."
},
"instance.settings.tabs.java.environment-variables": {
"message": "Miljövariabler"
@@ -996,13 +1005,13 @@
"message": "Skapa genväg"
},
"instance.worlds.dont_show_on_home": {
"message": "Visa inte på Startsidan"
"message": "Visa inte på startsidan"
},
"instance.worlds.game_already_open": {
"message": "Instans är redan öppen"
},
"instance.worlds.hardcore": {
"message": "Hardcore läge"
"message": "Hardcore-läge"
},
"instance.worlds.incompatible_server": {
"message": "Servern är inkompatibel"
@@ -1014,10 +1023,10 @@
"message": "Servern kunde inte kontaktas"
},
"instance.worlds.no_server_quick_play": {
"message": "Du kan bara hoppa rakt in till servers på Minecraft Alfa 1.0.5+"
"message": "Du kan endast gå direkt in i servrar på Minecraft Alfa 1.0.5+"
},
"instance.worlds.no_singleplayer_quick_play": {
"message": "Du kan bara hoppa rakt in till enspelarläge världar på Minecraft 1,20+"
"message": "Du kan endast gå direkt in i enspelarläge världar på Minecraft 1.20+"
},
"instance.worlds.play_instance": {
"message": "Spela instans"
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "{count} dünya ara..."
},
"app.modal.install-to-play.dont-install": {
"message": "İndirme"
},
"app.modal.install-to-play.header": {
"message": "Oynamak için yükleyin"
},
"app.modal.install-to-play.install-anyway": {
"message": "Yine de indir"
},
"app.modal.install-to-play.install-button": {
"message": "Yükle"
},
"app.modal.install-to-play.invite-warning": {
"message": "Bu davetiye Modrinth tarafından değil, başka bir Modrinth kullanıcısı tarafından oluşturulmuştur. Sadece güvendiğiniz kişilerden gelen davetleri kabul edin."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {#mod} other {#mods}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Dosya formatı ne olursa olsun (.mrpack dahil), bir dosya yalnızca Modrinth'e yüklendiğinde denetlenir."
},
"app.modal.install-to-play.shared-instance": {
"message": "Paylaşılan Kurulum"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Bu sunucunun mod paketi Modrinth'te yayınlanmamış doysaları mevcut. Yalnızca güvendiğiniz kaynaklardan dosya indirmenizi önemle tavsiye ederiz."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Bilinmeyen dosya uyarısı"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Tanımlanamayan dosyalar"
},
"app.modal.install-to-play.view-contents": {
"message": "İçeriği görüntüle"
},
"app.modal.update-to-play.header": {
"message": "Oynamak için güncelle"
},
"app.modal.update-to-play.removed": {
"message": "Silindi"
},
"app.modal.update-to-play.update-required-description": {
"message": "{name} oyununu oynamak için güncelleme gereklidir. Oyunu başlatmak için lütfen en son sürüme güncelleyin."
},
+85 -4
View File
@@ -30,11 +30,14 @@
"message": "Скасовано через закриття додатку"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "Не вдалось прочитати збірку модів"
"message": "Не вдалось прочитати збірку модифікацій"
},
"app.action-bar.install.summary.canceled": {
"message": "Скасовано"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "Очищення не завершено"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "Не вдалося завантажити файли"
},
@@ -57,7 +60,7 @@
"message": "Дані збірки модів недійсні"
},
"app.action-bar.install.summary.invalid-modpack-files": {
"message": "Файли збірки модів містять не дійсні метадані"
"message": "Файли збірки модифікацій містять не дійсні метадані"
},
"app.action-bar.install.summary.java-setup-failed": {
"message": "Не вдалося завершити встановлення Java"
@@ -86,6 +89,9 @@
"app.action-bar.install.unknown-instance": {
"message": "Невідомий екземпляр"
},
"app.action-bar.installs": {
"message": "Установки"
},
"app.action-bar.make-primary-instance": {
"message": "Зробити основним профілем"
},
@@ -177,7 +183,7 @@
"message": "Час гри"
},
"app.appearance-settings.skip-non-essential-warnings.description": {
"message": "Автоматично пропускає підтвердження з низьким рівнем ризику, як-от повторне встановлення збірки модів, видалення звичайного вмісту, масові оновлення, відвʼязування збірки модів та записи на відновлення. Небезпечні попередження все одно зображуватимуться."
"message": "Автоматично пропускає підтвердження з низьким рівнем ризику, такі як встановлення дублікатів інсталяцій, звичайне видалення вмісту, масові оновлення, від’єднання інсталяцій та запити на відновлення. Попередження про небезпеку й надалі будуть показуватися."
},
"app.appearance-settings.skip-non-essential-warnings.title": {
"message": "Пропустити несуттєві попередження"
@@ -252,7 +258,7 @@
"message": "Експортувати збірку"
},
"app.export-modal.modpack-name-label": {
"message": "Назва збірки модів"
"message": "Назва збірки"
},
"app.export-modal.modpack-name-placeholder": {
"message": "Назва збірки"
@@ -344,6 +350,12 @@
"app.instance.mods.bulk-update.downloading-projects": {
"message": "Завантаження проєктів: {current, number}/{total, number}..."
},
"app.instance.mods.bulk-update.finishing": {
"message": "Завершуємо оновлення…"
},
"app.instance.mods.bulk-update.resolving-versions": {
"message": "Знаходимо версії…"
},
"app.instance.mods.content-type-project": {
"message": "проєкт"
},
@@ -368,6 +380,18 @@
"app.instance.worlds.browse-servers": {
"message": "Переглянути сервери"
},
"app.instance.worlds.delete-world-modal.delete-button": {
"message": "Видалити світ"
},
"app.instance.worlds.delete-world-modal.title": {
"message": "Видалити світ"
},
"app.instance.worlds.delete-world-modal.warning-body": {
"message": "Цей світ буде видалено назавжди з цього екземпляра. Це не можна скасувати."
},
"app.instance.worlds.delete-world-modal.warning-header": {
"message": "Видалення {name}"
},
"app.instance.worlds.filter-modded": {
"message": "Модифіковано"
},
@@ -386,39 +410,90 @@
"app.instance.worlds.no-worlds-heading": {
"message": "Сервера або світи не додано"
},
"app.instance.worlds.remove-server-modal.remove-button": {
"message": "Видалити сервер"
},
"app.instance.worlds.remove-server-modal.title": {
"message": "Видалити сервер"
},
"app.instance.worlds.remove-server-modal.warning-body": {
"message": "Цей сервер буде видалено з вашого списку серверів. Ви зможете повернути його, якщо знаєте адресу."
},
"app.instance.worlds.remove-server-modal.warning-header": {
"message": "Видалення {name}"
},
"app.instance.worlds.search-worlds-placeholder": {
"message": "Пошук {count} світів…"
},
"app.modal.install-to-play.dont-install": {
"message": "Не встановлювати"
},
"app.modal.install-to-play.header": {
"message": "Установлення для гри"
},
"app.modal.install-to-play.install-anyway": {
"message": "Усе одно встановити"
},
"app.modal.install-to-play.install-button": {
"message": "Установити"
},
"app.modal.install-to-play.invite-warning": {
"message": "Це запрошення створив інший користувач Modrinth, не сам Modrinth. Приймайте запрошення лише від тих людей, яким довіряєте."
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, one {# мод} few {# мода} other {# модів}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "Файл перевірятиметься, лише якщо його завантажено на Modrinth, незалежно від його формату (включно з .mrpack)."
},
"app.modal.install-to-play.shared-instance": {
"message": "Профіль"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "Ця збірка сервера містить файли, які не є опубліковані на Modrinth. Ми наполегливо рекомендуємо встановлювати лише ті файли, яким довіряєте."
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "Попередження про невідомі файли"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "Нерозпізнані файли"
},
"app.modal.install-to-play.view-contents": {
"message": "Дивитися вміст"
},
"app.modal.update-to-play.header": {
"message": "Оновлення для гри"
},
"app.modal.update-to-play.removed": {
"message": "Видалено"
},
"app.modal.update-to-play.update-required-description": {
"message": "«{name}» потребує оновлення, щоб грати. Будь ласка, оновіть до останньої версії, щоб запустити гру."
},
"app.project.install-button.already-installed": {
"message": "Проєкт уже встановлено"
},
"app.project.install-button.switch-version": {
"message": "Змінити версію"
},
"app.project.install-context.back-to-browse": {
"message": "Повернутися до дослідження"
},
"app.project.install-context.install-content-to-instance": {
"message": "Установити вміст до профілю"
},
"app.project.version.all-versions": {
"message": "Усі версії"
},
"app.project.version.download-in-browser": {
"message": "Завантажити в браузері"
},
"app.project.version.installing": {
"message": "Установлення"
},
"app.project.versions.already-installed": {
"message": "Уже встановлено"
},
"app.settings.developer-mode-enabled": {
"message": "Увімкнено режим розробника."
},
@@ -539,6 +614,9 @@
"app.skins.section.builders-and-biomes": {
"message": "Builders & Biomes"
},
"app.skins.section.chaos-cubed": {
"message": "Chaos Cubed"
},
"app.skins.section.chase-the-skies": {
"message": "Chase the Skies"
},
@@ -956,6 +1034,9 @@
"instance.worlds.copy_address": {
"message": "Скопіювати адресу"
},
"instance.worlds.create_shortcut": {
"message": "Створити ярлик"
},
"instance.worlds.dont_show_on_home": {
"message": "Не показувати на головній"
},
@@ -11,6 +11,33 @@
"app.action-bar.hide-more-running-instances": {
"message": "Đóng các phiên bản đang chạy"
},
"app.action-bar.install.retry": {
"message": "Thử lại"
},
"app.action-bar.install.summary.app-closing": {
"message": "Đã hủy do đóng ứng dụng"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "Không đọc được modpack"
},
"app.action-bar.install.summary.canceled": {
"message": "Đã hủy"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "Dọn dẹp không hoàn thện"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "Không tải được tệp"
},
"app.action-bar.install.summary.corrupt-download": {
"message": "Tệp được tải bị hỏng"
},
"app.action-bar.install.summary.could-not-save-files": {
"message": "Không lưu được tệp"
},
"app.action-bar.install.summary.download-failed": {
"message": "Không hoàn tất tải xuống"
},
"app.action-bar.make-primary-instance": {
"message": "Đặt làm bản instance chính"
},
@@ -224,6 +251,15 @@
"app.instance.worlds.browse-servers": {
"message": "Tìm kiếm máy chủ"
},
"app.instance.worlds.delete-world-modal.delete-button": {
"message": "Xóa thế giới"
},
"app.instance.worlds.delete-world-modal.title": {
"message": "Xóa thế giới"
},
"app.instance.worlds.delete-world-modal.warning-header": {
"message": "Đang xóa {name}"
},
"app.instance.worlds.filter-modded": {
"message": "Modded"
},
@@ -242,12 +278,27 @@
"app.instance.worlds.no-worlds-heading": {
"message": "Không có máy chủ hay thế giới nào đã được thêm"
},
"app.instance.worlds.remove-server-modal.remove-button": {
"message": "Bỏ khỏi danh sách"
},
"app.instance.worlds.remove-server-modal.title": {
"message": "Xóa máy chủ"
},
"app.instance.worlds.remove-server-modal.warning-header": {
"message": "{name} sẽ bị xóa"
},
"app.instance.worlds.search-worlds-placeholder": {
"message": "Tìm kiếm {count} world..."
},
"app.modal.install-to-play.dont-install": {
"message": "Ngừng tải"
},
"app.modal.install-to-play.header": {
"message": "Tải xuống để chơi"
},
"app.modal.install-to-play.install-anyway": {
"message": "Tải tiếp"
},
"app.modal.install-to-play.install-button": {
"message": "Tải xuống"
},
@@ -263,18 +314,36 @@
"app.modal.update-to-play.header": {
"message": "Cập nhật và bắt đầu chơi"
},
"app.modal.update-to-play.removed": {
"message": "Đã bỏ"
},
"app.modal.update-to-play.update-required-description": {
"message": "Bạn cần cập nhật {name} để có thể chơi. Vui lòng cập nhật lên bản mới nhất để khởi chạy trò chơi."
},
"app.project.install-button.already-installed": {
"message": "Dự án này đã được cài đặt"
},
"app.project.install-button.switch-version": {
"message": "Đổi phiên bản"
},
"app.project.install-context.back-to-browse": {
"message": "Quay lại trang Khám Phá"
},
"app.project.install-context.install-content-to-instance": {
"message": "Cài đặt nội dung vào phiên bản"
},
"app.project.version.all-versions": {
"message": "Tất cả phiên bản"
},
"app.project.version.download-in-browser": {
"message": "Tải trong trình duyệt"
},
"app.project.version.installing": {
"message": "Đang tải"
},
"app.project.versions.already-installed": {
"message": "Đã có sẵn"
},
"app.settings.developer-mode-enabled": {
"message": "Chế độ nhà phát triển đã được bật."
},
@@ -395,6 +464,9 @@
"app.skins.section.builders-and-biomes": {
"message": "Builders & Biomes"
},
"app.skins.section.chaos-cubed": {
"message": "Chaos Cubed"
},
"app.skins.section.chase-the-skies": {
"message": "Chase the Skies"
},
@@ -812,6 +884,9 @@
"instance.worlds.copy_address": {
"message": "Sao chép địa chỉ"
},
"instance.worlds.create_shortcut": {
"message": "Tạo lối tắt"
},
"instance.worlds.dont_show_on_home": {
"message": "Không hiện ở Trang chủ"
},
+28 -4
View File
@@ -15,7 +15,7 @@
"message": "已复制"
},
"app.action-bar.install.copy-details": {
"message": "复制详"
"message": "复制详细信息"
},
"app.action-bar.install.dismiss": {
"message": "忽略"
@@ -30,13 +30,13 @@
"message": "由于应用关闭而取消"
},
"app.action-bar.install.summary.bad-modpack-file": {
"message": "无法读取整合包"
"message": "整合包读取失败"
},
"app.action-bar.install.summary.canceled": {
"message": "已取消"
},
"app.action-bar.install.summary.cleanup-incomplete": {
"message": "清理未完成"
"message": "未完成清理"
},
"app.action-bar.install.summary.content-download-failed": {
"message": "无法下载文件"
@@ -48,7 +48,7 @@
"message": "无法保存文件"
},
"app.action-bar.install.summary.download-failed": {
"message": "下载无法完成"
"message": "无法完成下载"
},
"app.action-bar.install.summary.instance-not-found": {
"message": "无法找到实例"
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "搜索 {count} 个世界……"
},
"app.modal.install-to-play.dont-install": {
"message": "不要安装"
},
"app.modal.install-to-play.header": {
"message": "安装以游玩"
},
"app.modal.install-to-play.install-anyway": {
"message": "无视风险继续安装"
},
"app.modal.install-to-play.install-button": {
"message": "安装"
},
"app.modal.install-to-play.invite-warning": {
"message": "这个邀请是由另一位 Modrinth 用户创建的,而不是 Modrinth 官方。只接受你信任的人的邀请。"
},
"app.modal.install-to-play.mod-count": {
"message": "{count} 个模组"
},
"app.modal.install-to-play.reviewed-files": {
"message": "只有上传到 Modrinth 的文件才会经过审核,无论其文件格式如何(包括 .mrpack)。"
},
"app.modal.install-to-play.shared-instance": {
"message": "共享实例"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "这个整合包包含一些未在 Modrinth 发布的文件。我们强烈建议只从你信任的来源安装文件。"
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "未知文件警告"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "未识别文件"
},
"app.modal.install-to-play.view-contents": {
"message": "查看内容"
},
"app.modal.update-to-play.header": {
"message": "更新以游玩"
},
"app.modal.update-to-play.removed": {
"message": "已移除"
},
"app.modal.update-to-play.update-required-description": {
"message": "需要更新至最新版本才能运行 {name}。请更新后启动游戏。"
},
@@ -425,24 +425,48 @@
"app.instance.worlds.search-worlds-placeholder": {
"message": "搜尋 {count} 個世界..."
},
"app.modal.install-to-play.dont-install": {
"message": "不要安裝"
},
"app.modal.install-to-play.header": {
"message": "安裝以遊玩"
},
"app.modal.install-to-play.install-anyway": {
"message": "仍要安裝"
},
"app.modal.install-to-play.install-button": {
"message": "安裝"
},
"app.modal.install-to-play.invite-warning": {
"message": "這份邀請是由另一位 Modrinth 使用者建立,並非由 Modrinth 官方建立。請僅接受來自你信任的人的邀請。"
},
"app.modal.install-to-play.mod-count": {
"message": "{count, plural, other {# 個模組}}"
},
"app.modal.install-to-play.reviewed-files": {
"message": "只有在 Modrinth 上發布的檔案才會經過審查,無論其檔案格式為何(包含 .mrpack)。"
},
"app.modal.install-to-play.shared-instance": {
"message": "共用實例"
},
"app.modal.install-to-play.unknown-files-description": {
"message": "這個伺服器模組包中包含未在 Modrinth 上發布的檔案。強烈建議你僅安裝來自信任來源的檔案。"
},
"app.modal.install-to-play.unknown-files-warning": {
"message": "未知檔案警告"
},
"app.modal.install-to-play.unrecognized-files": {
"message": "無法辨識的檔案"
},
"app.modal.install-to-play.view-contents": {
"message": "檢視內容"
},
"app.modal.update-to-play.header": {
"message": "更新以遊玩"
},
"app.modal.update-to-play.removed": {
"message": "已移除"
},
"app.modal.update-to-play.update-required-description": {
"message": "需要更新才能遊玩「{name}」。請更新至最新版本以啟動遊戲。"
},
+27 -239
View File
@@ -13,207 +13,31 @@
@unlinked="fetchInstance"
/>
<UpdateToPlayModal ref="updateToPlayModal" :instance="instance" />
<ContentPageHeader>
<template #icon>
<Avatar
:src="icon ? icon : undefined"
:alt="instance.name"
size="64px"
:tint-by="instance.id"
/>
</template>
<template #title>
{{ instance.name }}
</template>
<template #stats>
<div class="flex items-center flex-wrap gap-2">
<template v-if="!isServerInstance">
<div class="flex items-center gap-2 capitalize font-medium">
{{ instance.loader }} {{ instance.game_version }}
</div>
<template v-if="showInstancePlayTime">
<div class="w-1.5 h-1.5 rounded-full bg-surface-5"></div>
<div class="flex items-center gap-2 font-medium">
<template v-if="timePlayed > 0">
{{ timePlayedHumanized }}
</template>
<template v-else> Never played </template>
</div>
</template>
</template>
<template v-else>
<template v-if="loadingServerPing">
<ServerOnlinePlayers
v-if="playersOnline !== undefined"
:online="playersOnline"
:status-online="statusOnline"
hide-label
/>
<ServerRecentPlays :recent-plays="recentPlays ?? 0" hide-label />
<div
v-if="
(playersOnline !== undefined || recentPlays !== undefined) &&
(minecraftServer?.region || ping)
"
class="w-1.5 h-1.5 rounded-full bg-surface-5"
></div>
<ServerPing v-if="ping" :ping="ping" />
</template>
<ServerRegion v-if="minecraftServer?.region" :region="minecraftServer?.region" />
<div
v-if="minecraftServer?.region || ping"
class="w-1.5 h-1.5 rounded-full bg-surface-5"
></div>
<div
v-if="linkedProjectV3"
class="flex gap-1.5 items-center font-medium text-primary"
>
Linked to
<Avatar
:src="linkedProjectV3.icon_url"
:alt="linkedProjectV3.name"
:tint-by="instance.id"
size="24px"
/>
<router-link
:to="`/project/${linkedProjectV3.slug ?? linkedProjectV3.id}`"
class="hover:underline text-primary truncate"
>
{{ linkedProjectV3.name }}
</router-link>
</div>
</template>
</div>
</template>
<template #actions>
<div class="flex gap-2">
<ButtonStyled
v-if="
[
'installing',
'pack_installing',
'pack_installed',
'not_installed',
'minecraft_installing',
].includes(instance.install_stage)
"
color="brand"
size="large"
>
<button disabled>Installing...</button>
</ButtonStyled>
<ButtonStyled
v-else-if="instance.install_stage !== 'installed'"
color="brand"
size="large"
>
<button @click="repairInstance()">
<DownloadIcon />
Repair
</button>
</ButtonStyled>
<ButtonStyled v-else-if="playing === true" color="red" size="large">
<button :disabled="stopping" @click="stopInstance('InstancePage')">
<StopCircleIcon />
{{ stopping ? 'Stopping...' : 'Stop' }}
</button>
</ButtonStyled>
<ButtonStyled
v-else-if="playing === false && loading === false && !isServerInstance"
color="brand"
size="large"
>
<button @click="startInstance('InstancePage')">
<PlayIcon />
Play
</button>
</ButtonStyled>
<div
v-else-if="playing === false && loading === false && isServerInstance"
class="joined-buttons"
>
<ButtonStyled color="brand" size="large">
<button @click="handlePlayServer()">
<PlayIcon />
Play
</button>
</ButtonStyled>
<ButtonStyled color="brand" size="large">
<OverflowMenu
:options="[
{
id: 'join_server',
action: () => handlePlayServer(),
},
{
id: 'launch_instance',
action: () => startInstance('InstancePage'),
},
]"
>
<div class="w-0 text-xl relative top-0.5 right-2.5">
<DropdownIcon />
</div>
<template #join_server>
<PlayIcon />
Join server
</template>
<template #launch_instance>
<PlayIcon />
Launch instance
</template>
</OverflowMenu>
</ButtonStyled>
</div>
<ButtonStyled
v-else-if="loading === true && playing === false"
color="brand"
size="large"
>
<button disabled>Starting...</button>
</ButtonStyled>
<ButtonStyled circular size="large">
<button v-tooltip="'Instance settings'" @click="settingsModal?.show()">
<SettingsIcon />
</button>
</ButtonStyled>
<ButtonStyled type="transparent" circular size="large">
<OverflowMenu
:options="[
{
id: 'open-folder',
action: () => {
if (instance) showInstanceInFolder(instance.id)
},
},
{
id: 'export-mrpack',
action: () => exportModal?.show(),
},
{
id: 'create-shortcut',
action: () => createShortcut(),
},
]"
>
<MoreVerticalIcon />
<template #share-instance> <UserPlusIcon /> Share instance </template>
<template #host-a-server> <ServerIcon /> Create a server </template>
<template #open-folder> <FolderOpenIcon /> Open folder </template>
<template #export-mrpack> <PackageIcon /> Export modpack </template>
<template #create-shortcut> <ExternalIcon /> Create shortcut </template>
</OverflowMenu>
</ButtonStyled>
</div>
</template>
</ContentPageHeader>
<InstancePageHeader
:instance="instance"
:icon-src="icon"
:is-server-instance="isServerInstance"
:show-instance-play-time="showInstancePlayTime"
:time-played="timePlayed"
:playing="playing"
:loading="loading"
:stopping="stopping"
:loading-server-ping="loadingServerPing"
:players-online="playersOnline"
:status-online="statusOnline"
:recent-plays="recentPlays"
:ping="ping"
:minecraft-server="minecraftServer"
:linked-project-v3="linkedProjectV3"
@repair="() => repairInstance()"
@stop="() => stopInstance('InstancePage')"
@play="() => startInstance('InstancePage')"
@play-server="() => handlePlayServer()"
@settings="() => settingsModal?.show()"
@open-folder="() => instance && showInstanceInFolder(instance.id)"
@export="() => exportModal?.show()"
@create-shortcut="() => createShortcut()"
/>
</div>
<div :class="['px-6', { 'shrink-0': isFixedRender }]">
<NavTabs :links="tabs" />
@@ -272,49 +96,30 @@ import {
BoxesIcon,
CheckCircleIcon,
ClipboardCopyIcon,
DownloadIcon,
DropdownIcon,
EditIcon,
ExternalIcon,
EyeIcon,
FolderOpenIcon,
GlobeIcon,
HashIcon,
MoreVerticalIcon,
PackageIcon,
PlayIcon,
PlusIcon,
ServerIcon,
SettingsIcon,
StopCircleIcon,
TerminalSquareIcon,
UpdatedIcon,
UserPlusIcon,
XIcon,
} from '@modrinth/assets'
import {
Avatar,
ButtonStyled,
ContentPageHeader,
injectNotificationManager,
NavTabs,
OverflowMenu,
ServerOnlinePlayers,
ServerPing,
ServerRecentPlays,
ServerRegion,
useLoadingBarToken,
} from '@modrinth/ui'
import { injectNotificationManager, NavTabs, useLoadingBarToken } from '@modrinth/ui'
import { useQueryClient } from '@tanstack/vue-query'
import { convertFileSrc } from '@tauri-apps/api/core'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import relativeTime from 'dayjs/plugin/relativeTime'
import { computed, onUnmounted, ref, shallowRef, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import ContextMenu from '@/components/ui/ContextMenu.vue'
import ExportModal from '@/components/ui/ExportModal.vue'
import InstancePageHeader from '@/components/ui/instance-page-header/index.vue'
import InstanceSettingsModal from '@/components/ui/modal/InstanceSettingsModal.vue'
import UpdateToPlayModal from '@/components/ui/modal/UpdateToPlayModal.vue'
import {
@@ -336,7 +141,6 @@ import { injectServerInstall } from '@/providers/server-install'
import { handleSevereError } from '@/store/error.js'
import { useBreadcrumbs, useTheming } from '@/store/state'
dayjs.extend(duration)
dayjs.extend(relativeTime)
const { addNotification, handleError } = injectNotificationManager()
@@ -758,22 +562,6 @@ const timePlayed = computed(() => {
: 0
})
const timePlayedHumanized = computed(() => {
const duration = dayjs.duration(timePlayed.value, 'seconds')
const hours = Math.floor(duration.asHours())
if (hours >= 1) {
return hours + ' hour' + (hours > 1 ? 's' : '')
}
const minutes = Math.floor(duration.asMinutes())
if (minutes >= 1) {
return minutes + ' minute' + (minutes > 1 ? 's' : '')
}
const seconds = Math.floor(duration.asSeconds())
return seconds + ' second' + (seconds > 1 ? 's' : '')
})
onUnmounted(() => {
unlistenProcesses()
unlistenInstances()
+170 -146
View File
@@ -59,142 +59,100 @@
>
<ProjectBackgroundGradient :project="data" />
</Teleport>
<ProjectHeader
<ProjectPageHeader
v-else
:project="data"
:project-v3="projectV3"
:ping="serverPing"
:show-status-badge="data.status !== 'approved'"
@contextmenu.prevent.stop="handleRightClick"
@category="(category) => router.push(`${projectSearchUrl}?f=categories:${category}`)"
>
<template v-if="isServerProject" #actions>
<ButtonStyled v-if="serverPlaying" size="large" color="red">
<button @click="handleStopServer">
<StopCircleIcon />
{{ formatMessage(commonMessages.stopButton) }}
</button>
</ButtonStyled>
<ButtonStyled v-else size="large" color="brand">
<button
:disabled="data && installingServerProjects.includes(data.id)"
@click="handleClickPlay"
>
<PlayIcon />
{{
data && installingServerProjects.includes(data.id)
? formatMessage(commonMessages.installingLabel)
: formatMessage(commonMessages.playButton)
}}
</button>
</ButtonStyled>
<ButtonStyled size="large" circular>
<button
v-tooltip="formatMessage(commonMessages.addServerToInstanceButton)"
@click="handleAddServerToInstance"
>
<PlusIcon />
</button>
</ButtonStyled>
<ButtonStyled size="large" circular type="transparent">
<OverflowMenu
:tooltip="`More options`"
:options="[
{
id: 'open-in-browser',
link: `https://modrinth.com/project/${data.slug}`,
external: true,
},
{
divider: true,
},
{
id: 'report',
color: 'red',
hoverFilled: true,
link: `https://modrinth.com/report?item=project&itemID=${data.id}`,
},
]"
aria-label="More options"
>
<MoreVerticalIcon aria-hidden="true" />
<template #open-in-browser>
<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
</template>
<template #report> <ReportIcon /> Report </template>
</OverflowMenu>
</ButtonStyled>
<template #actions>
<template v-if="isServerProject">
<ButtonStyled v-if="serverPlaying" color="red" size="large">
<button type="button" @click="handleStopServer">
<StopCircleIcon />
{{ formatMessage(commonMessages.stopButton) }}
</button>
</ButtonStyled>
<ButtonStyled v-else color="brand" size="large">
<button type="button" :disabled="serverInstallLoading" @click="handleClickPlay">
<PlayIcon />
{{
serverInstallLoading
? formatMessage(commonMessages.installingLabel)
: formatMessage(commonMessages.playButton)
}}
</button>
</ButtonStyled>
<ButtonStyled circular size="large">
<button
v-tooltip="formatMessage(commonMessages.addServerToInstanceButton)"
type="button"
:aria-label="formatMessage(commonMessages.addServerToInstanceButton)"
@click="handleAddServerToInstance"
>
<PlusIcon />
</button>
</ButtonStyled>
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="serverProjectHeaderMoreActions"
tooltip="More options"
aria-label="More options"
>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</template>
<template v-else>
<ButtonStyled v-if="showSwitchVersion && onVersionsPage" size="large">
<button v-tooltip="formatMessage(messages.alreadyInstalled)" type="button" disabled>
<CheckIcon />
{{ formatMessage(commonMessages.installedLabel) }}
</button>
</ButtonStyled>
<ButtonStyled v-else-if="showSwitchVersion" size="large">
<button type="button" @click="goToVersions">
<SwapIcon />
{{ formatMessage(messages.switchVersion) }}
</button>
</ButtonStyled>
<ButtonStyled v-else color="brand" size="large">
<button
v-tooltip="
installButtonInstalled ? formatMessage(messages.alreadyInstalled) : undefined
"
type="button"
:disabled="installButtonDisabled"
@click="install(null)"
>
<component :is="installButtonIcon" :class="installButtonIconClass" />
{{
installButtonInstalled
? formatMessage(commonMessages.installedLabel)
: installButtonValidating
? formatMessage(commonMessages.validatingLabel)
: installButtonLoading
? formatMessage(commonMessages.installingLabel)
: serverProjectSelected
? formatMessage(commonMessages.selectedLabel)
: formatMessage(commonMessages.installButton)
}}
</button>
</ButtonStyled>
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="projectHeaderMoreActions"
tooltip="More options"
aria-label="More options"
>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</template>
</template>
<template v-else #actions>
<ButtonStyled v-if="showSwitchVersion && onVersionsPage" size="large">
<button v-tooltip="installButtonTooltip" disabled>
<CheckIcon />
{{ formatMessage(commonMessages.installedLabel) }}
</button>
</ButtonStyled>
<ButtonStyled v-else-if="showSwitchVersion" size="large">
<button @click="goToVersions">
<SwapIcon />
{{ formatMessage(messages.switchVersion) }}
</button>
</ButtonStyled>
<ButtonStyled v-else size="large" color="brand">
<button
v-tooltip="installButtonTooltip"
:disabled="installButtonDisabled"
@click="install(null)"
>
<SpinnerIcon
v-if="installButtonLoading && !installButtonInstalled"
class="animate-spin"
/>
<DownloadIcon v-else-if="!installButtonInstalled && !serverProjectSelected" />
<CheckIcon v-else />
{{ installButtonLabel }}
</button>
</ButtonStyled>
<ButtonStyled size="large" circular type="transparent">
<OverflowMenu
:tooltip="`More options`"
:options="[
{
id: 'follow',
disabled: true,
tooltip: 'Coming soon',
action: () => {},
},
{
id: 'save',
disabled: true,
tooltip: 'Coming soon',
action: () => {},
},
{
id: 'open-in-browser',
link: `https://modrinth.com/${data.project_type}/${data.slug}`,
external: true,
},
{
divider: true,
},
{
id: 'report',
color: 'red',
hoverFilled: true,
link: `https://modrinth.com/report?item=project&itemID=${data.id}`,
},
]"
aria-label="More options"
>
<MoreVerticalIcon aria-hidden="true" />
<template #open-in-browser>
<ExternalIcon /> {{ formatMessage(commonMessages.openInBrowserButton) }}
</template>
<template #follow> <HeartIcon /> Follow </template>
<template #save> <BookmarkIcon /> Save </template>
<template #report> <ReportIcon /> Report </template>
</OverflowMenu>
</ButtonStyled>
</template>
</ProjectHeader>
</ProjectPageHeader>
<NavTabs
:links="[
{
@@ -289,9 +247,8 @@ import {
getTargetInstallPreferences,
injectNotificationManager,
NavTabs,
OverflowMenu,
ProjectBackgroundGradient,
ProjectHeader,
ProjectPageHeader,
ProjectSidebarCompatibility,
ProjectSidebarCreators,
ProjectSidebarDetails,
@@ -300,6 +257,7 @@ import {
ProjectSidebarTags,
requestInstall,
SelectedProjectsFloatingBar,
TeleportOverflowMenu,
useVIntl,
} from '@modrinth/ui'
import { useQueryClient } from '@tanstack/vue-query'
@@ -358,14 +316,14 @@ const messages = defineMessages({
id: 'app.project.install-context.back-to-browse',
defaultMessage: 'Back to discover',
},
installContentToInstance: {
id: 'app.project.install-context.install-content-to-instance',
defaultMessage: 'Install content to instance',
},
alreadyInstalled: {
id: 'app.project.install-button.already-installed',
defaultMessage: 'This project is already installed',
},
installContentToInstance: {
id: 'app.project.install-context.install-content-to-instance',
defaultMessage: 'Install content to instance',
},
switchVersion: {
id: 'app.project.install-button.switch-version',
defaultMessage: 'Switch version',
@@ -529,17 +487,72 @@ const installButtonInstalled = computed(() =>
const installButtonDisabled = computed(
() => installButtonInstalled.value || installButtonLoading.value,
)
const installButtonLabel = computed(() => {
if (installButtonInstalled.value) return formatMessage(commonMessages.installedLabel)
if (installButtonValidating.value) return formatMessage(commonMessages.validatingLabel)
if (installButtonLoading.value) return formatMessage(commonMessages.installingLabel)
if (serverProjectSelected.value) return formatMessage(commonMessages.selectedLabel)
return formatMessage(commonMessages.installButton)
})
const installButtonTooltip = computed(() => {
if (installButtonInstalled.value) return formatMessage(messages.alreadyInstalled)
return null
const serverInstallLoading = computed(
() => !!data.value && installingServerProjects.value.includes(data.value.id),
)
const installButtonIcon = computed(() => {
if (installButtonLoading.value && !installButtonInstalled.value) return SpinnerIcon
if (!installButtonInstalled.value && !serverProjectSelected.value) return DownloadIcon
return CheckIcon
})
const installButtonIconClass = computed(() =>
installButtonLoading.value && !installButtonInstalled.value ? 'animate-spin' : undefined,
)
const serverProjectHeaderMoreActions = computed(() => [
{
id: 'open-in-browser',
label: formatMessage(commonMessages.openInModrinthButton),
icon: ExternalIcon,
action: openProjectInBrowser,
},
{
divider: true,
},
{
id: 'report',
label: formatMessage(commonMessages.reportButton),
icon: ReportIcon,
color: 'red',
action: reportProject,
},
])
const projectHeaderMoreActions = computed(() => [
{
id: 'follow',
label: formatMessage(commonMessages.followButton),
icon: HeartIcon,
disabled: true,
tooltip: 'Coming soon',
action: () => {},
},
{
id: 'save',
label: formatMessage(commonMessages.saveButton),
icon: BookmarkIcon,
disabled: true,
tooltip: 'Coming soon',
action: () => {},
},
{
id: 'open-in-browser',
label: formatMessage(commonMessages.openInModrinthButton),
icon: ExternalIcon,
action: openProjectInBrowser,
},
{
divider: true,
},
{
id: 'report',
label: formatMessage(commonMessages.reportButton),
icon: ReportIcon,
color: 'red',
action: reportProject,
},
])
const projectSearchUrl = computed(
() => `/browse/${isServerProject.value ? 'server' : data.value?.project_type}`,
)
const showSwitchVersion = computed(() => !!instance.value && installed.value)
const onVersionsPage = computed(() => route.name === 'Versions')
@@ -585,6 +598,17 @@ function handleAddServerToInstance() {
showAddServerToInstanceModal(data.value.title, address)
}
function openProjectInBrowser() {
if (!data.value) return
const type = isServerProject.value ? 'project' : data.value.project_type
void openUrl(`https://modrinth.com/${type}/${data.value.slug}`)
}
function reportProject() {
if (!data.value) return
void openUrl(`https://modrinth.com/report?item=project&itemID=${data.value.id}`)
}
async function fetchProjectData() {
const [project, projectV3Result] = await Promise.all([
get_project(route.params.id, 'must_revalidate').catch(handleError),
@@ -0,0 +1,163 @@
<template>
<PageHeader :title="organization.name" :summary="organization.description">
<template #leading>
<Avatar
:src="organization.icon_url"
:alt="organization.name"
:tint-by="organization.id"
size="96px"
/>
</template>
<template #badges>
<PageHeaderBadgeItem :icon="OrganizationIcon" class="px-0 text-primary">
{{ formatMessage(messages.organizationLabel) }}
</PageHeaderBadgeItem>
</template>
<template #metadata>
<PageHeaderMetadata>
<PageHeaderMetadataNumberItem
:icon="UsersIcon"
:value="membersCount"
:label="formatMessage(messages.membersLabel)"
/>
<PageHeaderMetadataNumberItem
:icon="BoxIcon"
:value="projectsCount"
:label="formatMessage(messages.projectsLabel)"
/>
<PageHeaderMetadataNumberItem
:icon="DownloadIcon"
:value="downloads"
:label="formatMessage(messages.downloadsLabel)"
:tooltip="formatNumber(downloads)"
/>
</PageHeaderMetadata>
</template>
<template #actions>
<PageHeaderActions>
<ButtonStyled v-if="canManage" size="large">
<nuxt-link :to="`/organization/${organization.slug}/settings`">
<SettingsIcon />
{{ formatMessage(messages.manage) }}
</nuxt-link>
</ButtonStyled>
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="moreActions"
:tooltip="formatMessage(commonMessages.moreOptionsButton)"
:aria-label="formatMessage(commonMessages.moreOptionsButton)"
>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</PageHeaderActions>
</template>
</PageHeader>
</template>
<script setup lang="ts">
import {
BoxIcon,
ClipboardCopyIcon,
DownloadIcon,
MoreVerticalIcon,
OrganizationIcon,
SettingsIcon,
UsersIcon,
} from '@modrinth/assets'
import {
Avatar,
ButtonStyled,
commonMessages,
defineMessages,
PageHeader,
PageHeaderActions,
PageHeaderBadgeItem,
PageHeaderMetadata,
PageHeaderMetadataNumberItem,
TeleportOverflowMenu,
type TeleportOverflowMenuItem,
useFormatNumber,
useVIntl,
} from '@modrinth/ui'
import { computed } from 'vue'
const messages = defineMessages({
downloadsLabel: {
id: 'organization.label.downloads',
defaultMessage: 'downloads',
},
manage: {
id: 'organization.button.manage',
defaultMessage: 'Manage',
},
manageProjects: {
id: 'organization.button.manage-projects',
defaultMessage: 'Manage projects',
},
membersLabel: {
id: 'organization.label.members',
defaultMessage: 'members',
},
organizationLabel: {
id: 'organization.label.organization',
defaultMessage: 'Organization',
},
projectsLabel: {
id: 'organization.label.projects',
defaultMessage: 'projects',
},
})
const props = defineProps<{
organization: {
id: string
name: string
slug: string
description?: string | null
icon_url?: string | null
}
membersCount: number
projectsCount: number
downloads: number
canManage?: boolean
}>()
const emit = defineEmits<{
manageProjects: []
copyId: []
copyPermalink: []
}>()
const { formatMessage } = useVIntl()
const formatNumber = useFormatNumber()
const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
{
id: 'manage-projects',
label: formatMessage(messages.manageProjects),
icon: BoxIcon,
action: () => emit('manageProjects'),
shown: props.canManage,
},
{
divider: true,
shown: props.canManage,
},
{
id: 'copy-id',
label: formatMessage(commonMessages.copyIdButton),
icon: ClipboardCopyIcon,
action: () => emit('copyId'),
},
{
id: 'copy-permalink',
label: formatMessage(commonMessages.copyPermalinkButton),
icon: ClipboardCopyIcon,
action: () => emit('copyPermalink'),
},
])
</script>
@@ -0,0 +1,127 @@
<template>
<ButtonStyled size="large" circular>
<PopoutMenu
v-if="authUser"
:tooltip="
saved ? formatMessage(commonMessages.savedLabel) : formatMessage(commonMessages.saveButton)
"
from="top-right"
:aria-label="formatMessage(commonMessages.saveButton)"
:dropdown-id="`${baseId}-save`"
>
<BookmarkIcon aria-hidden="true" :fill="saved ? 'currentColor' : 'none'" />
<template #menu>
<StyledInput
v-model="displayCollectionsSearch"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
wrapper-class="menu-search"
/>
<div v-if="filteredCollections.length > 0" class="collections-list text-primary">
<Checkbox
v-for="option in filteredCollections"
:key="option.id"
:model-value="option.projects.includes(projectId)"
class="popout-checkbox"
@update:model-value="() => collectProject(option, projectId)"
>
{{ option.name }}
</Checkbox>
</div>
<div v-else class="menu-text">
<p class="popout-text">{{ noCollectionsLabel }}</p>
</div>
<ButtonStyled>
<button class="mx-3 mb-3" @click="createCollection">
<PlusIcon aria-hidden="true" />
{{ createNewCollectionLabel }}
</button>
</ButtonStyled>
</template>
</PopoutMenu>
<nuxt-link
v-else
v-tooltip="formatMessage(commonMessages.saveButton)"
:to="signInRoute"
:aria-label="formatMessage(commonMessages.saveButton)"
>
<BookmarkIcon aria-hidden="true" />
</nuxt-link>
</ButtonStyled>
</template>
<script setup lang="ts">
import { BookmarkIcon, PlusIcon } from '@modrinth/assets'
import {
ButtonStyled,
Checkbox,
commonMessages,
PopoutMenu,
StyledInput,
useVIntl,
} from '@modrinth/ui'
import { computed, ref } from 'vue'
import type { RouteLocationRaw } from 'vue-router'
type CollectionOption = {
id: string
name: string
projects: string[]
}
const props = defineProps<{
authUser?: unknown
signInRoute: RouteLocationRaw
projectId: string
collections: CollectionOption[]
saved: boolean
baseId: string
noCollectionsLabel: string
createNewCollectionLabel: string
collectProject: (option: CollectionOption, projectId: string) => void | Promise<void>
createCollection: (event: MouseEvent) => void
}>()
const { formatMessage } = useVIntl()
const displayCollectionsSearch = ref('')
const filteredCollections = computed(() =>
props.collections
.filter((collection) =>
collection.name.toLowerCase().includes(displayCollectionsSearch.value.toLowerCase()),
)
.slice()
.sort((a, b) => a.name.localeCompare(b.name)),
)
</script>
<style scoped lang="scss">
.popout-checkbox {
padding: var(--gap-sm) var(--gap-md);
white-space: nowrap;
&:hover {
filter: brightness(0.95);
}
}
.menu-text {
padding: 0 var(--gap-md);
font-size: var(--font-size-nm);
color: var(--color-secondary);
}
.menu-search {
margin: var(--gap-sm) var(--gap-md);
width: calc(100% - var(--gap-md) * 2);
}
.collections-list {
max-height: 40rem;
overflow-y: auto;
background-color: var(--color-bg);
border-radius: var(--radius-md);
margin: var(--gap-sm) var(--gap-md);
padding: var(--gap-sm);
}
</style>
@@ -0,0 +1,294 @@
<template>
<PageHeader :title="user.username" :summary="summary">
<template #leading>
<Avatar
:src="user.avatar_url"
:alt="user.username"
:size="isModrinthUser ? '64px' : '96px'"
:tint-by="user.username"
circle
/>
</template>
<template v-if="isOfficialAccount || showAffiliateBadge" #badges>
<PageHeaderBadgeItem
v-if="isOfficialAccount"
:icon="BadgeCheckIcon"
:icon-props="{ fill: 'var(--color-brand-highlight)' }"
:tooltip="formatMessage(messages.officialAccount)"
class="border-brand-highlight bg-brand-highlight text-brand"
>
{{ formatMessage(messages.officialAccount) }}
</PageHeaderBadgeItem>
<PageHeaderBadgeItem
v-if="showAffiliateBadge"
:icon="AffiliateIcon"
class="border-brand-highlight bg-brand-highlight text-brand"
>
{{ formatMessage(messages.affiliateLabel) }}
</PageHeaderBadgeItem>
</template>
<template v-if="$slots.summary" #summary>
<slot name="summary" />
</template>
<template v-if="!isModrinthUser" #metadata>
<PageHeaderMetadata>
<PageHeaderMetadataNumberItem
:icon="BoxIcon"
:value="projectsCount"
:label="formatMessage(messages.profileProjectCountLabel, { count: projectsCount })"
/>
<PageHeaderMetadataNumberItem
:icon="DownloadIcon"
:value="downloads"
:label="formatMessage(messages.profileDownloadCountLabel, { count: downloads })"
:tooltip="downloadsTooltip"
/>
<PageHeaderMetadataTimeItem
:icon="CalendarIcon"
:date="user.created"
:label="formatMessage(messages.profileJoinedLabel)"
:tooltip="joinedTooltip"
/>
</PageHeaderMetadata>
</template>
<template #actions>
<PageHeaderActions>
<ButtonStyled v-if="isSelf" size="large">
<nuxt-link to="/settings/profile">
<EditIcon />
{{ formatMessage(commonMessages.editButton) }}
</nuxt-link>
</ButtonStyled>
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="moreActions"
:tooltip="formatMessage(commonMessages.moreOptionsButton)"
:aria-label="formatMessage(commonMessages.moreOptionsButton)"
>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</PageHeaderActions>
</template>
</PageHeader>
</template>
<script setup lang="ts">
import type { Labrinth } from '@modrinth/api-client'
import {
AffiliateIcon,
BadgeCheckIcon,
BoxIcon,
CalendarIcon,
ChartIcon,
ClipboardCopyIcon,
CurrencyIcon,
DownloadIcon,
EditIcon,
InfoIcon,
MoreVerticalIcon,
ReportIcon,
} from '@modrinth/assets'
import {
Avatar,
ButtonStyled,
commonMessages,
defineMessages,
PageHeader,
PageHeaderActions,
PageHeaderBadgeItem,
PageHeaderMetadata,
PageHeaderMetadataNumberItem,
PageHeaderMetadataTimeItem,
TeleportOverflowMenu,
type TeleportOverflowMenuItem,
useFormatDateTime,
useFormatNumber,
useVIntl,
} from '@modrinth/ui'
import { computed } from 'vue'
const messages = defineMessages({
affiliateLabel: {
id: 'profile.label.affiliate',
defaultMessage: 'Affiliate',
},
analyticsButton: {
id: 'profile.button.analytics',
defaultMessage: 'View user analytics',
},
billingButton: {
id: 'profile.button.billing',
defaultMessage: 'Manage user billing',
},
editRoleButton: {
id: 'profile.button.edit-role',
defaultMessage: 'Edit role',
},
infoButton: {
id: 'profile.button.info',
defaultMessage: 'View user details',
},
officialAccount: {
id: 'profile.official-account',
defaultMessage: 'Official Modrinth account',
},
profileJoinedLabel: {
id: 'profile.label.joined',
defaultMessage: 'Joined',
},
profileProjectCountLabel: {
id: 'profile.label.project-count',
defaultMessage: '{count, plural, one {project} other {projects}}',
},
profileDownloadCountLabel: {
id: 'profile.label.download-count',
defaultMessage: '{count, plural, one {download} other {downloads}}',
},
profileManageProjectsButton: {
id: 'profile.button.manage-projects',
defaultMessage: 'Manage projects',
},
removeAffiliateButton: {
id: 'profile.button.remove-affiliate',
defaultMessage: 'Remove as affiliate',
},
setAffiliateButton: {
id: 'profile.button.set-affiliate',
defaultMessage: 'Set as affiliate',
},
})
const props = withDefaults(
defineProps<{
user: Labrinth.Users.v3.User
summary?: string | null
authUser?: Labrinth.Users.v3.User | null
isModrinthUser?: boolean
isOfficialAccount?: boolean
showAffiliateBadge?: boolean
isAffiliate?: boolean
isSelf?: boolean
isAdmin?: boolean
isStaff?: boolean
projectsCount?: number
downloads?: number
}>(),
{
summary: null,
authUser: null,
isModrinthUser: false,
isOfficialAccount: false,
showAffiliateBadge: false,
isAffiliate: false,
isSelf: false,
isAdmin: false,
isStaff: false,
projectsCount: 0,
downloads: 0,
},
)
const emit = defineEmits<{
manageProjects: []
report: []
copyId: []
copyPermalink: []
openBilling: []
toggleAffiliate: []
openInfo: []
openAnalytics: []
editRole: []
}>()
const { formatMessage } = useVIntl()
const formatNumber = useFormatNumber()
const formatDateTime = useFormatDateTime({
timeStyle: 'short',
dateStyle: 'long',
})
const downloadsTooltip = computed(() => formatNumber(props.downloads))
const joinedTooltip = computed(() => formatDateTime(props.user.created))
const moreActions = computed<TeleportOverflowMenuItem[]>(() => [
{
id: 'manage-projects',
label: formatMessage(messages.profileManageProjectsButton),
icon: BoxIcon,
action: () => emit('manageProjects'),
shown: props.isSelf,
},
{
divider: true,
shown: props.isSelf,
},
{
id: 'report',
label: formatMessage(commonMessages.reportButton),
icon: ReportIcon,
action: () => emit('report'),
color: 'red',
shown: props.authUser?.id !== props.user.id,
},
{
id: 'copy-id',
label: formatMessage(commonMessages.copyIdButton),
icon: ClipboardCopyIcon,
action: () => emit('copyId'),
},
{
id: 'copy-permalink',
label: formatMessage(commonMessages.copyPermalinkButton),
icon: ClipboardCopyIcon,
action: () => emit('copyPermalink'),
},
{
divider: true,
shown: props.isAdmin,
},
{
id: 'open-billing',
label: formatMessage(messages.billingButton),
icon: CurrencyIcon,
action: () => emit('openBilling'),
shown: props.isStaff,
},
{
id: 'toggle-affiliate',
label: props.isAffiliate
? formatMessage(messages.removeAffiliateButton)
: formatMessage(messages.setAffiliateButton),
icon: AffiliateIcon,
action: () => emit('toggleAffiliate'),
shown: props.isAdmin,
remainOnClick: true,
color: props.isAffiliate ? 'red' : 'orange',
},
{
id: 'open-info',
label: formatMessage(messages.infoButton),
icon: InfoIcon,
action: () => emit('openInfo'),
shown: props.isStaff,
},
{
id: 'open-analytics',
label: formatMessage(messages.analyticsButton),
icon: ChartIcon,
action: () => emit('openAnalytics'),
shown: props.isAdmin,
},
{
id: 'edit-role',
label: formatMessage(messages.editRoleButton),
icon: EditIcon,
action: () => emit('editRole'),
shown: props.isAdmin,
},
])
</script>
@@ -72,6 +72,18 @@
/>
</div>
<div class="hidden" aria-hidden="true">
<input
id="create-account-consent"
v-model="accountConsent"
name="account_consent"
type="checkbox"
tabindex="-1"
autocomplete="off"
/>
<label for="create-account-consent">I agree to receive account updates by email</label>
</div>
<ButtonStyled color="brand">
<button
class="!w-full font-bold"
@@ -97,7 +109,7 @@ import {
StyledInput,
useVIntl,
} from '@modrinth/ui'
import { computed } from 'vue'
import { computed, ref } from 'vue'
import HCaptcha from '@/components/ui/auth/HCaptcha.vue'
@@ -109,7 +121,7 @@ interface AuthGlobals {
interface Props {
globals?: AuthGlobals | null
requiresDob?: boolean
onCompleteSignUp?: () => void
onCompleteSignUp?: (accountConsent: boolean) => void
onSetCaptchaRef?: ((captchaRef: unknown) => void) | undefined
}
@@ -127,6 +139,7 @@ const dateOfBirthModel = defineModel<string | null>('dateOfBirth', { default: ''
const usernameModel = defineModel<string>('username', { default: '' })
const tokenModel = defineModel<string>('token', { default: '' })
const subscribeModel = defineModel<boolean>('subscribe', { default: false })
const accountConsent = ref(false)
const maxInputDate = computed(() => `${new Date().getFullYear()}-12-31`)
@@ -198,7 +211,7 @@ function onCompleteSignUpClick() {
return
}
onCompleteSignUp()
onCompleteSignUp(accountConsent.value)
}
const messages = defineMessages({
+30 -4
View File
@@ -443,20 +443,23 @@
:options="[
{
id: 'new-project',
action: (event) => $refs.modal_creation.show(event),
action: (event) => requireVerifiedEmail(() => $refs.modal_creation.show(event)),
},
{
id: 'new-server-project',
action: (event) => $refs.modal_creation.show(event, { type: 'server' }),
action: (event) =>
requireVerifiedEmail(() => $refs.modal_creation.show(event, { type: 'server' })),
},
{
id: 'new-collection',
action: (event) => $refs.modal_collection_creation.show(event),
action: (event) =>
requireVerifiedEmail(() => $refs.modal_collection_creation.show(event)),
},
{ divider: true },
{
id: 'new-organization',
action: (event) => $refs.modal_organization_creation.show(event),
action: (event) =>
requireVerifiedEmail(() => $refs.modal_organization_creation.show(event)),
},
]"
>
@@ -777,6 +780,7 @@ import {
createHostingIntercomIdentityKey,
defineMessages,
injectModrinthClient,
injectNotificationManager,
injectPageContext,
OverflowMenu,
providePageContext,
@@ -814,6 +818,7 @@ const generatedState = useGeneratedState()
const country = useUserCountry()
const { formatMessage } = useVIntl()
const { addNotification } = injectNotificationManager()
const auth = await useAuth()
const user = await useUser()
@@ -906,6 +911,19 @@ async function fetchIntercomToken() {
})
}
function requireVerifiedEmail(action) {
if (!auth.value.user?.email_verified) {
addNotification({
title: formatMessage(messages.emailVerificationRequired),
text: formatMessage(messages.verifyEmailBeforePublishing),
type: 'error',
})
return
}
action()
}
const navMenuMessages = defineMessages({
home: {
id: 'layout.nav.home',
@@ -962,6 +980,14 @@ const messages = defineMessages({
id: 'layout.action.publish',
defaultMessage: 'Publish',
},
emailVerificationRequired: {
id: 'layout.publish.email-verification-required.title',
defaultMessage: 'Email verification required',
},
verifyEmailBeforePublishing: {
id: 'layout.publish.email-verification-required.description',
defaultMessage: 'You must verify your email before publishing on Modrinth.',
},
reviewProjects: {
id: 'layout.action.review-projects',
defaultMessage: 'Project review',
@@ -2171,9 +2171,6 @@
"profile.label.collection": {
"message": "Kolekce"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {stažení} few {stažení} other {stažení}}"
},
"profile.label.joined": {
"message": "Členem od"
},
@@ -2192,9 +2189,6 @@
"profile.label.organizations": {
"message": "Organizace"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {projekt} few {projekty} other {projektů}}"
},
"profile.label.saving": {
"message": "Ukládání..."
},
@@ -2528,12 +2522,6 @@
"project.settings.visit-dashboard": {
"message": "Přejít na přehled projektů"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {stažení} few {stažení} other {stažení}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {# sledující} few {# sledující} other {# sledujících}}"
},
"project.versions.title": {
"message": "Verze"
},
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Kollektion"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {Download} other {Downloads}}"
},
"profile.label.joined": {
"message": "Beigetreten"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organisationen"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {Projekt} other {Projekte}}"
},
"profile.label.saving": {
"message": "Speichert..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Projekt-Dashboard besuchen"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {Download} other {Downloads}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {Follower} other {Follower}}"
},
"project.status.archived.message": {
"message": "{title} wurde archiviert. {title} wird keine weiteren Updates erhalten, es sei denn, der Autor entscheided sich, das Projekt zu Dearchivieren."
},
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Kollektion"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {Download} other {Downloads}}"
},
"profile.label.joined": {
"message": "Beigetreten"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organisationen"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {Projekt} other {Projekte}}"
},
"profile.label.saving": {
"message": "Speichert..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Projekt-Dashboard besuchen"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {Download} other {Downloads}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {Follower} other {Follower}}"
},
"project.status.archived.message": {
"message": "{title} wurde archiviert. {title} wird keine weiteren Updates erhalten, es sei denn, der Autor entscheidet sich das Projekt zu dearchivieren."
},
+34 -10
View File
@@ -2672,6 +2672,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Upgrade to Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "You must verify your email before publishing on Modrinth."
},
"layout.publish.email-verification-required.title": {
"message": "Email verification required"
},
"moderation.exclude-technical-review": {
"message": "Exclude TR"
},
@@ -2999,6 +3005,24 @@
"muralpay.warning.wallet-address": {
"message": "Double-check your wallet address. Funds sent to an incorrect address cannot be recovered."
},
"organization.button.manage": {
"message": "Manage"
},
"organization.button.manage-projects": {
"message": "Manage projects"
},
"organization.label.downloads": {
"message": "downloads"
},
"organization.label.members": {
"message": "members"
},
"organization.label.organization": {
"message": "Organization"
},
"organization.label.projects": {
"message": "projects"
},
"organization.settings.projects.edit-links.affected-projects": {
"message": "Changes will be applied to {count, plural, one {# project} other {# projects}}."
},
@@ -3068,8 +3092,8 @@
"profile.label.collection": {
"message": "Collection"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {download} other {downloads}}"
"profile.label.download-count": {
"message": "{count, plural, one {download} other {downloads}}"
},
"profile.label.joined": {
"message": "Joined"
@@ -3089,8 +3113,8 @@
"profile.label.organizations": {
"message": "Organizations"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {project} other {projects}}"
"profile.label.project-count": {
"message": "{count, plural, one {project} other {projects}}"
},
"profile.label.saving": {
"message": "Saving..."
@@ -3254,6 +3278,12 @@
"project.actions.dont-show-again": {
"message": "Don't show again"
},
"project.actions.edit-project": {
"message": "Edit project"
},
"project.actions.rescan-modpack": {
"message": "Rescan modpack"
},
"project.actions.review-project": {
"message": "Review project"
},
@@ -3656,12 +3686,6 @@
"project.settings.visit-dashboard": {
"message": "Visit projects dashboard"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {download} other {downloads}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {follower} other {followers}}"
},
"project.status.archived.message": {
"message": "{title} has been archived. {title} will not receive any further updates unless the author decides to unarchive the project."
},
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Colección"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {descarga} other {descargas}}"
},
"profile.label.joined": {
"message": "Se unió"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organizaciones"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {proyecto} other {proyectos}}"
},
"profile.label.saving": {
"message": "Guardando..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Ver el panel de control de proyectos"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {descarga} other {descargas}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {seguidor} other {seguidores}}"
},
"project.status.archived.message": {
"message": "{title} se ha archivado. {title} no recibirá más actualizaciones hasta que el autor decida desarchivar el proyecto."
},
@@ -2891,9 +2891,6 @@
"profile.label.collection": {
"message": "Colección"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {descarga} other {descargas}}"
},
"profile.label.joined": {
"message": "Se unió hace"
},
@@ -2912,9 +2909,6 @@
"profile.label.organizations": {
"message": "Organizaciones"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {proyecto} other {proyectos}}"
},
"profile.label.saving": {
"message": "Guardando..."
},
@@ -3377,12 +3371,6 @@
"project.settings.visit-dashboard": {
"message": "Visita el panel de proyectos"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {descarga} other {descargas}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {seguidor} other {seguidores}}"
},
"project.status.archived.message": {
"message": "{title} ha sido archivado. {title} no recibirá ninguna futura actualización excepto que el autor decida desarchivar el proyecto."
},
@@ -2213,9 +2213,6 @@
"profile.label.collection": {
"message": "Koleksiyon"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {download} other {na download}}"
},
"profile.label.joined": {
"message": "Sumali"
},
@@ -2234,9 +2231,6 @@
"profile.label.organizations": {
"message": "Mga organisasyon"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {proyekto} other {na proyekto}}"
},
"profile.label.saving": {
"message": "Sine-save..."
},
+16 -16
View File
@@ -2472,7 +2472,7 @@
"message": "Ce déploiement du frontend de Modrinth na pas pu générer l’état à partir de lAPI. Cela peut être dû à une panne ou à une erreur de configuration. Rebuild lorsque lAPI sera disponible. Codes derreur : {errors} ; LURL actuelle de lAPI est : {url}"
},
"layout.banner.build-fail.ignore": {
"message": "ignorer"
"message": "Ignorer"
},
"layout.banner.build-fail.title": {
"message": "Erreur lors de la génération de l’état à partir de lAPI pendant la construction."
@@ -2672,6 +2672,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Passer à Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "Vous devez vérifier votre adresse e-mail avant de publier sur Modrinth."
},
"layout.publish.email-verification-required.title": {
"message": "Vérification de l'adresse e-mail requise"
},
"moderation.exclude-technical-review": {
"message": "Exclure la révision technique"
},
@@ -3068,9 +3074,6 @@
"profile.label.collection": {
"message": "Collection"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {téléchargement} other {téléchargements}}"
},
"profile.label.joined": {
"message": "Rejoint"
},
@@ -3089,9 +3092,6 @@
"profile.label.organizations": {
"message": "Organisations"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {projet} other {projets}}"
},
"profile.label.saving": {
"message": "Sauvegarde en cours..."
},
@@ -3395,6 +3395,12 @@
"project.download.unknown-loader": {
"message": "Loader inconnu"
},
"project.download.zip-failed-text": {
"message": "Un ou plusieurs fichiers n'ont pas pu être téléchargés. Veuillez essayer à nouveau."
},
"project.download.zip-failed-title": {
"message": "Impossible de télécharger les fichiers"
},
"project.environment.migration-no-permission.message": {
"message": "Nous venons de remanier le système d'Environnements sur Modrinth et de nouvelles options sont désormais disponibles. Vous n'avez pas l'autorisation de modifier ces paramètres, veuillez informer un autre membre du projet que les métadonnées de l'environnement doivent être vérifiées."
},
@@ -3426,7 +3432,7 @@
"message": "Galerie"
},
"project.license.error": {
"message": "Le texte de la license n'a pas pu être obtenu"
"message": "Le texte de la license n'a pas pu être obtenu."
},
"project.license.loading": {
"message": "Chargement du texte de la license..."
@@ -3528,7 +3534,7 @@
"message": "Projet mis à jour"
},
"project.settings.general.name.description": {
"message": "Évitez les préfixes, suffixes, parenthèses, ou les descriptions - juste le nom actuel du projet"
"message": "Évitez les préfixes, suffixes, parenthèses, ou les descriptions - juste le nom actuel du projet."
},
"project.settings.general.name.placeholder.1": {
"message": "ex. Nether Overhaul 2"
@@ -3650,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "Visiter le tableau de contrôle des projets"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {# téléchargement} other {# téléchargements}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {# suivi} other {# suivis}}"
},
"project.status.archived.message": {
"message": "{title} a été archivé. {title} ne recevra plus de mises à jour jusqu'à ce que l'auteur du projet décide de désarchiver le projet."
},
@@ -3681,7 +3681,7 @@
"message": "Incluez des liens et des images si possible et pertinentes. Les signalements vides ou insuffisants seront fermés et ignorés."
},
"report.body.title": {
"message": "Veuillez fournir des informations supplémentaires concernant votre signalement."
"message": "Veuillez fournir des informations supplémentaires concernant votre signalement"
},
"report.checking": {
"message": "Vérification de {item}..."
+15 -6
View File
@@ -8,6 +8,21 @@
"admin.billing.error.not-found": {
"message": "משתמש לא קיים"
},
"analytics.action.add": {
"message": "לְהוֹסִיף"
},
"analytics.action.cancel": {
"message": "ביטול"
},
"analytics.breakdown.project": {
"message": "פּרוֹיֶקט"
},
"analytics.chart.legend.monetization-details.description": {
"message": "רק צפיות והורדות שבוצעו דרך Modrinth נספרות לצורך מונטיזציה, והורדות מחייבות את המשתמשים להיות מחוברים לחשבונם."
},
"analytics.chart.render-limit.header": {
"message": "להציג את כל {count} הקווים בגרף?"
},
"app-marketing.download.description": {
"message": "היישום השולחני שלנו זמין לכל הפלטפורמות. אנא בחר את הגרסה הרצויה."
},
@@ -1823,9 +1838,6 @@
"profile.label.collection": {
"message": "אוסף"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {download} other {downloads}}"
},
"profile.label.joined": {
"message": "הצטרף ב-"
},
@@ -1844,9 +1856,6 @@
"profile.label.organizations": {
"message": "ארגונים"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {project} other {projects}}"
},
"profile.label.saving": {
"message": "שומר..."
},
+42 -21
View File
@@ -84,13 +84,13 @@
"message": "Megjegyzések"
},
"analytics.chart.controls.aria": {
"message": "Elemzési grafikonvezérlők, {activeCount}"
"message": "Statisztikai grafikonvezérlők, {activeCount}"
},
"analytics.chart.controls.button": {
"message": "Irányítások"
"message": "Vezérlők"
},
"analytics.chart.controls.dialog-aria": {
"message": "Elemzési grafikonok vezérlőelemei"
"message": "Statisztikai grafikonok vezérlőelemei"
},
"analytics.chart.controls.display": {
"message": "Kijelző"
@@ -159,7 +159,7 @@
"message": "{project}-tól/től függ"
},
"analytics.chart.tooltip.duration.days": {
"message": "{count, plural, one {#nap} other {#napok}}"
"message": "{count} nap"
},
"analytics.chart.tooltip.duration.hours": {
"message": "{count, plural, one {#óra} other {# órák}}"
@@ -270,10 +270,10 @@
"message": "Megtekintések alakulása"
},
"analytics.group-by.1h": {
"message": "1ó"
"message": "1 ó"
},
"analytics.group-by.6h": {
"message": "6ó"
"message": "6 ó"
},
"analytics.group-by.date": {
"message": "Dátum"
@@ -381,7 +381,7 @@
"message": "Lebontás:"
},
"analytics.query.label.grouped-by": {
"message": "Csoportosítás"
"message": "Csoportosítás:"
},
"analytics.query.label.project": {
"message": "Projekt:"
@@ -408,7 +408,7 @@
"message": "{hours} óra"
},
"analytics.stat.previous-period-comparison": {
"message": "az előző időszakhoz képes"
"message": "az előző időszakhoz képest"
},
"analytics.stat.previous-period-comparison-short": {
"message": "az előzőhöz képest"
@@ -438,7 +438,7 @@
"message": "Kiválasztott hossz"
},
"analytics.table.duration.days": {
"message": "{count, plural, one {# day} other {# days}}"
"message": "{count} nap"
},
"analytics.table.duration.hours": {
"message": "{count, plural, one {# hour} other {# hours}}"
@@ -2039,6 +2039,9 @@
"hosting-marketing.faq.location": {
"message": "Hol találhatók a Modrinth Hosting szerverei? Kiválaszthatom a régiót?"
},
"hosting-marketing.faq.location.answer": {
"message": "Jelenleg Észak-Amerikában, Európában, Délkelet-Ázsiában és Ausztráliában rendelkezünk szerverekkel, amelyeket vásárláskor kiválaszthatsz. A jövőben további régiók érkeznek! Ha régiót szeretnél váltani, kérlek vedd fel a kapcsolatot az ügyfélszolgálattal."
},
"hosting-marketing.faq.versions-loaders": {
"message": "Melyik Minecraft verziók és betöltők használhatók?"
},
@@ -2963,9 +2966,6 @@
"profile.label.collection": {
"message": "Gyűjtemény"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {letöltés} other {letöltések}}"
},
"profile.label.joined": {
"message": "Csatlakozott"
},
@@ -2984,9 +2984,6 @@
"profile.label.organizations": {
"message": "Szervezetek"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {projekt} other {projektek}}"
},
"profile.label.saving": {
"message": "Mentés..."
},
@@ -3440,6 +3437,9 @@
"project.settings.permissions.completed.description": {
"message": "Minden külső tartalomhoz megadva vannak a felhasználási engedélyek és a forrásmegjelölések."
},
"project.settings.permissions.completed.title": {
"message": "Engedélyek beállítva!"
},
"project.settings.permissions.empty-state.heading": {
"message": "Kész is van!"
},
@@ -3452,18 +3452,24 @@
"project.settings.permissions.search-placeholder": {
"message": "Keresés {count} projekt között..."
},
"project.settings.permissions.sort.most-files": {
"message": "Legtöbb fájl"
},
"project.settings.permissions.sort.recently-edited": {
"message": "Nemrég szerkesztett"
},
"project.settings.permissions.sort.rejected": {
"message": "Elutasítva"
},
"project.settings.permissions.sort.status": {
"message": "Állapot"
},
"project.settings.title": {
"message": "Beállítások"
},
"project.settings.visit-dashboard": {
"message": "Projektek irányítópult megnyitása"
},
"project.stats.downloads-label": {
"message": "{count} letöltés"
},
"project.stats.followers-label": {
"message": "{count} követő"
},
"project.status.archived.message": {
"message": "A(z) {title} archiválásra került. A(z) {title} nem kap további frissítéseket, kivéve, ha a fejlesztő úgy dönt, hogy visszavonja a projekt archiválását."
},
@@ -3977,6 +3983,9 @@
"settings.account.security.email.title": {
"message": "E-mail cím"
},
"settings.account.security.passkey.modal.added": {
"message": "Hozzá adva {ago}"
},
"settings.account.security.password.action.add": {
"message": "Jelszó hozzáadása"
},
@@ -4580,6 +4589,9 @@
"ui.newsletter-button.tooltip": {
"message": "Feliratkozás a Modrinth hírlevelére"
},
"version.confirm-delete.title": {
"message": "Biztos, hogy le akarod törölni ezt a verziót?"
},
"version.download.no-primary-file": {
"message": "Hiba: Nem található az elsődleges fájl"
},
@@ -4594,5 +4606,14 @@
},
"version.environment.unknown.title": {
"message": "Ismeretlen környezet"
},
"version.section.content.dev-info.gradle-snippet": {
"message": "build.gradle:"
},
"version.supplementary-resources.copy-hash-sha1": {
"message": "SHA-1 Másolása"
},
"version.supplementary-resources.copy-hash-sha512": {
"message": "SHA-512 Másolása"
}
}
@@ -2219,9 +2219,6 @@
"profile.label.collection": {
"message": "Koleksi"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, other {pengunduhan}}"
},
"profile.label.joined": {
"message": "Telah bergabung"
},
@@ -2240,9 +2237,6 @@
"profile.label.organizations": {
"message": "Organisasi"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, other {proyek}}"
},
"profile.label.saving": {
"message": "Menyimpan..."
},
@@ -3059,9 +3059,6 @@
"profile.label.collection": {
"message": "Raccolta"
},
"profile.label.downloads": {
"message": "{count} download"
},
"profile.label.joined": {
"message": "Iscrizione"
},
@@ -3080,9 +3077,6 @@
"profile.label.organizations": {
"message": "Organizzazioni"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {progetto} other {progetti}}"
},
"profile.label.saving": {
"message": "Salvando..."
},
@@ -3647,12 +3641,6 @@
"project.settings.visit-dashboard": {
"message": "Visita bacheca del progetto"
},
"project.stats.downloads-label": {
"message": "{count} download"
},
"project.stats.followers-label": {
"message": "{count} follower"
},
"project.status.archived.message": {
"message": "{title} è stato archiviato. {title} non riceverà più aggiornamenti a meno che l'autore decida di rimuoverlo dall'archivio."
},
+23 -14
View File
@@ -21,19 +21,19 @@
"message": "リセット"
},
"analytics.breakdown.country": {
"message": "国"
"message": "国 / 地域"
},
"analytics.breakdown.dependent-project-download": {
"message": "依存プロジェクト"
},
"analytics.breakdown.dependent-project-type": {
"message": "依存プロジェクトの種類"
"message": "依存プロジェクトのタイプ"
},
"analytics.breakdown.download-reason": {
"message": "きっかけ"
"message": "ダウンロードの追加情報"
},
"analytics.breakdown.download-source": {
"message": "ソース"
"message": "プラットフォーム"
},
"analytics.breakdown.game-version": {
"message": "ゲームのバージョン"
@@ -42,13 +42,13 @@
"message": "内訳"
},
"analytics.breakdown.loader": {
"message": "ローダー"
"message": "ゲームのローダー"
},
"analytics.breakdown.members": {
"message": "メンバー"
},
"analytics.breakdown.monetization": {
"message": "収益"
"message": "マネタイズ"
},
"analytics.breakdown.none.selected": {
"message": "分析 - デフォルト"
@@ -158,6 +158,9 @@
"analytics.empty.no-data-for-analytics": {
"message": "統計に使用可能なデータがありません"
},
"analytics.filter.game-version-type": {
"message": "ゲームバージョンタイプ"
},
"analytics.filter.game-version-type.all": {
"message": "全て"
},
@@ -245,6 +248,12 @@
"analytics.project-status.approved": {
"message": "承認済み"
},
"analytics.project-status.draft": {
"message": "ドラフト"
},
"analytics.project-status.other": {
"message": "その他"
},
"analytics.project-status.private": {
"message": "非公開"
},
@@ -254,6 +263,12 @@
"analytics.project.all": {
"message": "全てのプロジェクト"
},
"analytics.project.select": {
"message": "プロジェクトを選択"
},
"analytics.project.your": {
"message": "あなたのプロジェクト"
},
"analytics.query.filter.add": {
"message": "条件を追加"
},
@@ -336,7 +351,7 @@
"message": "アナリティクス"
},
"analytics.value.monetized": {
"message": "収益対象"
"message": "収益対象"
},
"analytics.value.no-dependent": {
"message": "なし"
@@ -351,7 +366,7 @@
"message": "不明"
},
"analytics.value.unmonetized": {
"message": "収益対象外"
"message": "収益対象外"
},
"app-marketing.download.description": {
"message": "我々のデスクトップアプリはすべてのプラットフォームでご利用いただけますので、ご希望のバージョンをお選びください。"
@@ -2582,9 +2597,6 @@
"profile.label.collection": {
"message": "コレクション"
},
"profile.label.downloads": {
"message": "{count}件のダウンロード"
},
"profile.label.joined": {
"message": "参加: "
},
@@ -2603,9 +2615,6 @@
"profile.label.organizations": {
"message": "組織"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {プロジェクト} other {プロジェクト}}"
},
"profile.label.saving": {
"message": "保存中…"
},
File diff suppressed because it is too large Load Diff
@@ -2750,9 +2750,6 @@
"profile.label.collection": {
"message": "Koleksi"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, other {muat turun}}"
},
"profile.label.joined": {
"message": "Telah menyertai"
},
@@ -2771,9 +2768,6 @@
"profile.label.organizations": {
"message": "Organisasi"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, other {projek}}"
},
"profile.label.saving": {
"message": "Sedang menyimpan..."
},
@@ -3188,9 +3182,6 @@
"project.settings.visit-dashboard": {
"message": "Kunjungi papan pemuka projek"
},
"project.stats.downloads-label": {
"message": "{count, plural, other {muat turun}}"
},
"project.status.archived.message": {
"message": "{title} telah diarkibkan. {title} tidak akan menerima sebarang kemas kini lanjut melainkan pengarang memutuskan untuk menyaharkibkan projek."
},
+274 -10
View File
@@ -41,6 +41,9 @@
"analytics.breakdown.game-version": {
"message": "Spel versie"
},
"analytics.breakdown.generic": {
"message": "Uitsplitsing"
},
"analytics.breakdown.loader": {
"message": "Lader"
},
@@ -50,6 +53,9 @@
"analytics.breakdown.monetization": {
"message": "Monetisatie"
},
"analytics.breakdown.none.selected": {
"message": "Geen uitsplitsing"
},
"analytics.breakdown.project": {
"message": "Project"
},
@@ -59,9 +65,15 @@
"analytics.breakdown.project-version": {
"message": "Project versie"
},
"analytics.breakdown.selected": {
"message": "Uitsplitsing naar {breakdown}"
},
"analytics.chart.action.show-all": {
"message": "Allemaal laten zien"
},
"analytics.chart.action.show-limited": {
"message": "Beperkt weergeven"
},
"analytics.chart.action.show-top-eight": {
"message": "Laat de top 8 zien"
},
@@ -74,6 +86,15 @@
"analytics.chart.controls.annotations": {
"message": "Annotatie"
},
"analytics.chart.controls.aria": {
"message": "Statistiekinstellingen, {activeCount}"
},
"analytics.chart.controls.button": {
"message": "Instellingen"
},
"analytics.chart.controls.dialog-aria": {
"message": "Statistiekinstellingen"
},
"analytics.chart.controls.display": {
"message": "Weergave"
},
@@ -98,18 +119,51 @@
"analytics.chart.empty.select-table-items": {
"message": "Selecteer een element uit de tabel beneden om jouw data te visualiseren."
},
"analytics.chart.events.count-aria": {
"message": "{count, plural, one {# statistiekgebeurtenis} other {# statistiekgebeurtenissen}}"
},
"analytics.chart.events.project-title": {
"message": "<project>{projectName}</project>: {title}"
},
"analytics.chart.events.see-announcement": {
"message": "Zie aankondiging"
},
"analytics.chart.legend.monetization-details.aria": {
"message": "Details van statistieken over inkomsten bekijken"
},
"analytics.chart.legend.monetization-details.description": {
"message": "Alleen weergaven en downloads via Modrinth tellen mee voor het genereren van inkomsten, en voor downloads moeten gebruikers ingelogd zijn."
},
"analytics.chart.legend.monetization-details.title": {
"message": "Details over genereren van inkomsten"
},
"analytics.chart.legend.previous-period-suffix": {
"message": "{name} (vorige)"
},
"analytics.chart.render-limit.description": {
"message": "Het laten zien van alle lijnen in de grafiek kan de pagina slomer maken."
},
"analytics.chart.render-limit.header": {
"message": "Alle {count} punten in de grafiek laten zien?"
},
"analytics.chart.table-selection.all": {
"message": "Alle weergegeven {itemType, select, project {{count, plural, one {project} other {projecten}}} country {{count, plural, one {land} other {landen}}} monetization {{count, plural, one {inkomstenwaarde} other {inkomstenwaarden}}} downloadSource {{count, plural, one {downloadbron} other {downloadbronnen}}} downloadReason {{count, plural, one {downloadreden} other {downloadredenen}}} member {{count, plural, one {lid} other {leden}}} projectVersion {{count, plural, one {projectversie} other {projectversies}}} loader {{count, plural, one {loader} other {loaders}}} gameVersion {{count, plural, one {spelversie} other {spelversies}}} other {{count, plural, one {item} other {items}}}} uit tabel"
},
"analytics.chart.table-selection.count": {
"message": "{count} {itemType, select, project {{count, plural, one {project} other {projecten}}} country {{count, plural, one {land} other {landen}}} monetization {{count, plural, one {inkomstenwaarde} other {inkomstenwaardes}}} downloadSource {{count, plural, one {downloadbron} other {downloadbronnen}}} downloadReason {{count, plural, one {downloadreden} other {downloadredenen}}} member {{count, plural, one {lid} other {leden}}} projectVersion {{count, plural, one {projectversie} other {projectversies}}} loader {{count, plural, one {loader} other {loaders}}} gameVersion {{count, plural, one {spelversie} other {spelversies}}} other {{count, plural, one {item} other {items}}}} uit tabel weergegeven"
},
"analytics.chart.table-selection.limited": {
"message": "{limit} {itemType, select, project {{limit, plural, one {project} other {projecten}}} country {{limit, plural, one {land} other {landen}}} monetization {{limit, plural, one {inkomstenwaarde} other {inkomstenwaardes}}} downloadSource {{limit, plural, one {downloadbron} other {downloadbronnen}}} downloadReason {{limit, plural, one {downloadreden} other {downloadredenen}}} member {{limit, plural, one {lid} other {leden}}} projectVersion {{limit, plural, one {projectversie} other {projectversies}}} loader {{limit, plural, one {loader} other {loaders}}} gameVersion {{limit, plural, one {spelversie} other {spelversies}}} other {{limit, plural, one {item} other {items}}}} uit tabel weergegeven"
},
"analytics.chart.table-selection.top": {
"message": "Top {count} {itemType, select, project {{count, plural, one {project} other {projecten}}} country {{count, plural, one {land} other {landen}}} monetization {{count, plural, one {inkomstenwaarde} other {inkomstenwaardes}}} downloadSource {{count, plural, one {downloadbron} other {downloadbronnen}}} downloadReason {{count, plural, one {downloadreden} other {downloadredenen}}} member {{count, plural, one {lid} other {leden}}} projectVersion {{count, plural, one {projectversie} other {projectversies}}} loader {{count, plural, one {loader} other {loaders}}} gameVersion {{count, plural, one {spelversie} other {spelversies}}} other {{count, plural, one {item} other {items}}}} uit tabel"
},
"analytics.chart.tooltip.dependent-on-project": {
"message": "Afhankelijk van {project}"
},
"analytics.chart.tooltip.dependent-project-version": {
"message": "{dependentProject} is afhankelijk van {dependencyProject}, {version}"
},
"analytics.chart.tooltip.duration.days": {
"message": "{count, plural, one {# dag} other {# dagen}}"
},
@@ -128,6 +182,9 @@
"analytics.chart.tooltip.pinned-aria": {
"message": "Vastgepind"
},
"analytics.chart.tooltip.previous-period-short": {
"message": "(vorige)"
},
"analytics.chart.tooltip.show-entry": {
"message": "Laat {name} in de grafiek zien"
},
@@ -143,6 +200,9 @@
"analytics.chart.view.line": {
"message": "Lijn"
},
"analytics.download-reason.dependency": {
"message": "Afhankelijkheid"
},
"analytics.download-reason.modpack": {
"message": "Modpack"
},
@@ -173,6 +233,9 @@
"analytics.empty.no-projects-for-analytics": {
"message": "Geen projecten beschikbaar voor analyse"
},
"analytics.empty.select-project": {
"message": "Selecteer ten minste één project om de gegevens te bekijken"
},
"analytics.filter.game-version-type": {
"message": "Game versie typen"
},
@@ -185,9 +248,15 @@
"analytics.filter.search.countries": {
"message": "Zoek landen..."
},
"analytics.filter.search.dependent-projects": {
"message": "Projecten zoeken..."
},
"analytics.filter.search.download-sources": {
"message": "Zoek download bron..."
},
"analytics.filter.search.members": {
"message": "Leden zoeken..."
},
"analytics.filter.search.project-versions": {
"message": "Zoek project versies..."
},
@@ -203,6 +272,9 @@
"analytics.graph.title.revenue": {
"message": "Inkomsten Over Tijd"
},
"analytics.graph.title.views": {
"message": "Ontwikkeling van aantal weergaven"
},
"analytics.group-by.1h": {
"message": "1h"
},
@@ -287,6 +359,9 @@
"analytics.project-status.unlisted": {
"message": "Verborgen"
},
"analytics.project-status.withheld": {
"message": "Niet weergegeven"
},
"analytics.project.all": {
"message": "Alle projecten"
},
@@ -308,6 +383,9 @@
"analytics.query.filter.add": {
"message": "Filter toevoegen"
},
"analytics.query.label.breakdown": {
"message": "Uitsplitsing:"
},
"analytics.query.label.grouped-by": {
"message": "Groepeer per"
},
@@ -320,6 +398,9 @@
"analytics.stat.downloads": {
"message": "Installaties"
},
"analytics.stat.monetization-banner.body": {
"message": "Alleen weergaven en downloads die via Modrinth plaatsvinden, komen in aanmerking voor inkomsten en moeten de fraudepreventiefiltering doorstaan. Voor downloads van de Modrinth-app moet de gebruiker bovendien ingelogd zijn. Aangezien alle projecten een vergelijkbaar percentage aan downloads met inkomsten hebben, zouden je inkomsten niet wezenlijk veranderen als alle downloads zouden worden meegeteld."
},
"analytics.stat.monetization-banner.learn-more": {
"message": "Meer informatie"
},
@@ -332,6 +413,12 @@
"analytics.stat.playtime-hours": {
"message": "{hours} uur"
},
"analytics.stat.previous-period-comparison": {
"message": "ten opzichte van vorige periode"
},
"analytics.stat.previous-period-comparison-short": {
"message": "ten opzichte van vorige"
},
"analytics.stat.revenue": {
"message": "Inkomsten"
},
@@ -341,12 +428,30 @@
"analytics.stat.unavailable": {
"message": "n.v.t."
},
"analytics.stat.unavailable-tooltip": {
"message": "Geen gegevens voor huidige zoekopdracht beschikbaar"
},
"analytics.stat.views": {
"message": "Weergaven"
},
"analytics.table.csv.date-range": {
"message": "{start} tot {end}"
},
"analytics.table.csv.filename": {
"message": "Modrinth Analytics {breakdown} Uitsplitsing - {dateRange}"
},
"analytics.table.csv.header.playtime-seconds": {
"message": "Speeltijd (seconden)"
},
"analytics.table.duration.days": {
"message": "{count, plural, one {# dag} other {# dagen}}"
},
"analytics.table.duration.hours": {
"message": "{count, plural, one {# uur} other {# uren}}"
},
"analytics.table.duration.minutes": {
"message": "{count, plural, one {# minuut} other {# minuten}}"
},
"analytics.table.empty.no-matching-rows": {
"message": "Geen passende gegevens"
},
@@ -371,12 +476,42 @@
"analytics.threshold.country-downloads-aria": {
"message": "Land download limiet"
},
"analytics.threshold.game-version-downloads-aria": {
"message": "Drempelwaarde voor aantal downloads van spelversies"
},
"analytics.threshold.game-versions-above": {
"message": "Spelversies met meer dan"
},
"analytics.threshold.project-downloads-aria": {
"message": "Drempelwaarde voor projectdownloads"
},
"analytics.threshold.project-version-downloads-aria": {
"message": "Drempelwaarde voor aantal downloads van projectversies"
},
"analytics.threshold.project-versions-above": {
"message": "Projectversies met meer dan"
},
"analytics.threshold.projects-above": {
"message": "Projecten boven"
},
"analytics.title": {
"message": "Analytica"
},
"analytics.value.monetized": {
"message": "Gemonetiseerd"
},
"analytics.value.no-dependent": {
"message": "Geen"
},
"analytics.value.no-dependent-tooltip": {
"message": "Gedownload om andere redenen dan dat het een afhankelijkheid is"
},
"analytics.value.none": {
"message": "Geen"
},
"analytics.value.other": {
"message": "Anders"
},
"analytics.value.unknown": {
"message": "Onbekend"
},
@@ -1574,12 +1709,24 @@
"dashboard.projects.selection-bar.aria-label": {
"message": ""
},
"dashboard.projects.selection-bar.selected-count": {
"message": "{count, plural, one {# geselecteerd project} other {# geselecteerde projecten}}"
},
"dashboard.projects.table.id": {
"message": "ID"
},
"dashboard.projects.table.name": {
"message": "Naam"
},
"dashboard.projects.table.select-all-bulk-editable": {
"message": "Selecteer alle projecten die bulkbewerking ondersteunen"
},
"dashboard.projects.table.status": {
"message": "Status"
},
"dashboard.projects.table.type": {
"message": "Type"
},
"dashboard.report.title": {
"message": "{id} rapporteren"
},
@@ -2519,6 +2666,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Upgrade naar Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "Je moet je e-mailadres verifiëren voordat je iets op Modrinth kunt publiceren."
},
"layout.publish.email-verification-required.title": {
"message": "E-mailverificatie vereist"
},
"moderation.exclude-technical-review": {
"message": "TR uitsluiten"
},
@@ -2852,6 +3005,9 @@
"profile.bio.fallback.user": {
"message": "Een Modrinth gebruiker."
},
"profile.button.analytics": {
"message": "Gebruikersstatistieken bekijken"
},
"profile.button.billing": {
"message": "Gebruikers facturering beheren"
},
@@ -2870,6 +3026,9 @@
"profile.button.set-affiliate": {
"message": "Zet als partner"
},
"profile.collection.projects-count": {
"message": "{count, plural, one {# project} other {# projecten}}"
},
"profile.details.label.auth-providers": {
"message": "Beveiliging providers"
},
@@ -2906,9 +3065,6 @@
"profile.label.collection": {
"message": "Collectie"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {download} other {downloads}}"
},
"profile.label.joined": {
"message": "Lid geworden"
},
@@ -2927,9 +3083,6 @@
"profile.label.organizations": {
"message": "Organisaties"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {project} other {projecten}}"
},
"profile.label.saving": {
"message": "Opslaan..."
},
@@ -2939,6 +3092,12 @@
"profile.meta.description-with-bio": {
"message": "{bio} - Download {username}'s projecten op Modrinth"
},
"profile.official-account": {
"message": "Officieel Modrinth-account"
},
"profile.official-account.bio": {
"message": "Het officiële gebruikersaccount van Modrinth. Neem contact op met het Helpcentrum via <support-link></support-link> of per e-mail via <email></email>"
},
"profile.stats.projects-followers": {
"message": "{count, plural, one {<stat>{count}</stat> project volger}other {<stat>{count}</stat> project volgers}}"
},
@@ -3110,15 +3269,108 @@
"project.details.licensed": {
"message": "Gelicentieerd"
},
"project.download.base-game-version-incompatible-tooltip": {
"message": "Deze spelversie is niet compatibel met het basisproject."
},
"project.download.base-loader-incompatible-tooltip": {
"message": "Deze loader is niet compatibel met het basisproject."
},
"project.download.compatible-version-title": {
"message": "Compatibele versies"
},
"project.download.dependencies-title": {
"message": "Afhankelijkheden"
},
"project.download.dependency-already-installed": {
"message": "Deze afhankelijkheid is al geïnstalleerd"
},
"project.download.dependency-any-compatible": {
"message": "Elke compatibele"
},
"project.download.dependency-conflicting": {
"message": "Deze afhankelijkheid is in conflict met een andere afhankelijkheid"
},
"project.download.dependency-download-file": {
"message": "{filename} downloaden"
},
"project.download.dependency-download-file-with-size": {
"message": "{filename} downloaden ({size})"
},
"project.download.dependency-duplicate": {
"message": "Deze afhankelijkheid is al opgenomen"
},
"project.download.dependency-missing-version": {
"message": "Deze versie van de afhankelijkheid is niet beschikbaar"
},
"project.download.dependency-no-compatible-version": {
"message": "Er is geen compatibele versie beschikbaar voor deze afhankelijkheid"
},
"project.download.dependency-quilt-fabric-api": {
"message": "Fabric API wordt voor Quilt overgeslagen"
},
"project.download.dependency-resource-pack-admonition": {
"message": "Dit project is afhankelijk van een vereist bronpakket. Download het en plaats het in je {folder} map."
},
"project.download.dependency-unavailable": {
"message": "Deze afhankelijkheid kan niet worden gedownload"
},
"project.download.download": {
"message": "Downloaden"
},
"project.download.download-as-zip": {
"message": "Als .zip downloaden"
},
"project.download.download-version": {
"message": "{version} downloaden"
},
"project.download.download-with-dependencies": {
"message": "Downloaden met afhankelijkheden"
},
"project.download.download-with-recommended": {
"message": "Met aanbevolen instellingen downloaden"
},
"project.download.download-with-recommended-as-zip": {
"message": "Met aanbevolen instellingen als .zip downloaden"
},
"project.download.duplicate-dependencies-hidden": {
"message": "Dubbele afhankelijkheden worden verborgen"
},
"project.download.file-unavailable": {
"message": "Dit bestand kan niet worden gedownload"
},
"project.download.game-version-unsupported-tooltip": {
"message": "{title} steunt niet {gameVersion} voor {platform}"
},
"project.download.install-with-app": {
"message": "Via de Modrinth-app installeren"
},
"project.download.manually": {
"message": "Handmatig downloaden"
},
"project.download.no-app": {
"message": "Heb je de Modrinth App niet?"
},
"project.download.no-game-versions-found": {
"message": "Geen spelversies gevonden"
},
"project.download.no-versions-available": {
"message": "Geen versies beschikbaar voor {gameVersion} en {platform}."
},
"project.download.platform-unsupported-tooltip": {
"message": "{title} steunt niet {platform} voor {gameVersion}"
},
"project.download.recommended-title": {
"message": "Aanbevolen"
},
"project.download.required-resource-pack-admonition": {
"message": "Voor dit gegevenspakket is ook een bronpakket nodig. Download het en plaats het in je {folder} map."
},
"project.download.required-resource-pack-short": {
"message": "Bronpakket"
},
"project.download.search-game-versions": {
"message": "Spelversie kiezen"
},
"project.download.select-game-version": {
"message": "Selecteer game-versie"
},
@@ -3257,6 +3509,15 @@
"project.settings.permissions.attention-needed.title": {
"message": "Onbekende externe inhoud"
},
"project.settings.permissions.sort.most-files": {
"message": "Meeste bestanden"
},
"project.settings.permissions.sort.recently-edited": {
"message": "Onlangs bewerkt"
},
"project.settings.permissions.sort.rejected": {
"message": "Afgewezen"
},
"project.settings.title": {
"message": "Instellingen"
},
@@ -3330,10 +3591,10 @@
"message": "Melding indienen"
},
"scopes.analytics.description": {
"message": "Krijg toegang tot jouw analysegegevens"
"message": "Bekijk je analysegegevens"
},
"scopes.analytics.label": {
"message": "Lees analyses"
"message": "Analyses bekijken"
},
"scopes.category.analytics": {
"message": "Statistieken"
@@ -3456,10 +3717,10 @@
"message": "Schrijf betalingen"
},
"scopes.performAnalytics.description": {
"message": "Voer analyserende handelingen uit"
"message": "Analytische acties uitvoeren"
},
"scopes.performAnalytics.label": {
"message": "Voer analyses uit"
"message": "Analyses uitvoeren"
},
"scopes.projectCreate.description": {
"message": "Nieuwe projecten aanmaken"
@@ -4357,5 +4618,8 @@
},
"version.environment.unknown.title": {
"message": "Onbekende omgeving"
},
"version.section.content.dev-info.maven-note": {
"message": "Opmerking: Indien beschikbaar, raden we je aan om de Maven-repository van de maker te gebruiken, aangezien deze informatie over transitieve afhankelijkheden bevat die de Modrinth Maven API niet biedt. Bovendien kun je te maken krijgen met dubbele afhankelijkheden als je voor je afhankelijkheden zowel Modrinth- als niet-Modrinth-Maven-repositories gebruikt, omdat de groeps-ID anders zal zijn wanneer deze via de Modrinth Maven API wordt aangeboden."
}
}
@@ -2678,9 +2678,6 @@
"profile.label.collection": {
"message": "Samling"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {nedlasting} other {nedlastinger}}"
},
"profile.label.joined": {
"message": "Blei med"
},
@@ -2699,9 +2696,6 @@
"profile.label.organizations": {
"message": "Organisasjoner"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {projekt} other {projekt}}"
},
"profile.label.saving": {
"message": "Lagrer..."
},
@@ -3038,12 +3032,6 @@
"project.settings.visit-dashboard": {
"message": "Besøk prosjekt-dashbordet"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {nedlasting} other {nedlastinger}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {følger} other {følgere}}"
},
"project.status.archived.message": {
"message": "{title} har blitt arkivert. {title} kommer ikke til å få noen nye oppdateringer, hvis ikke forfatteren bestemmer seg for å dearkivere prosjektet."
},
+2 -14
View File
@@ -132,7 +132,7 @@
"message": "Pokaż szczegóły analityki monetyzacji"
},
"analytics.chart.legend.monetization-details.description": {
"message": "Tylko wyświetlenia i pobrania z Modrinth liczą się do monetyzacji, gdzie pobrania wymagają, że użytkownik jest zalogowany."
"message": "Tylko wyświetlenia i pobrania z Modrinth liczą się do monetyzacji, gdzie pobrania wymagają bycia zalogowanym."
},
"analytics.chart.legend.monetization-details.title": {
"message": "Szczegóły analityki monetyzacji"
@@ -1029,7 +1029,7 @@
"message": "Wyślij "
},
"conversation-thread.action.send-to-review": {
"message": "Wyślij do sprawdzenia"
"message": "Wyślij do przeglądu"
},
"conversation-thread.action.send-to-review-with-reply": {
"message": "Wyślij do przeglądu z odpowiedzią"
@@ -3062,9 +3062,6 @@
"profile.label.collection": {
"message": "Kolekcja"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {pobranie} few {pobrania} other {pobrań}}"
},
"profile.label.joined": {
"message": "Dołączył(-a)"
},
@@ -3083,9 +3080,6 @@
"profile.label.organizations": {
"message": "Organizacje"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {projekt} few {projekty} other {projektów}}"
},
"profile.label.saving": {
"message": "Zapisywanie..."
},
@@ -3647,12 +3641,6 @@
"project.settings.visit-dashboard": {
"message": "Odwiedź pulpit projektów"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {pobranie} few {pobrania} other {pobrań}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {obserwujący} other {obserwujących}}"
},
"project.status.archived.message": {
"message": "{title} zostało zarchiwizowane. {title} nie będzie otrzymywać żadnych dalszych aktualizacji, chyba że autor zdecyduje się przywrócić projekt."
},
+6 -6
View File
@@ -2672,6 +2672,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Assinar o Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "Você precisa verificar seu e-mail antes de publicar no Modrinth."
},
"layout.publish.email-verification-required.title": {
"message": "Verificação de e-mail necessária"
},
"moderation.exclude-technical-review": {
"message": "Excluir RT"
},
@@ -3650,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "Visitar painel de projetos"
},
"project.stats.downloads-label": {
"message": "{count, plural, =0 {Nenhum download} one {# download} other {# downloads}}"
},
"project.stats.followers-label": {
"message": "{count, plural, =0 {Nenhum seguidor} one {# seguidor} other {# seguidores}}"
},
"project.status.archived.message": {
"message": "{title} foi arquivado. {title} não receberá atualizações a menos que o autor decida desarquivar o projeto."
},
@@ -2561,9 +2561,6 @@
"profile.label.collection": {
"message": "Coleção"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {transferência} other {transferências}}"
},
"profile.label.joined": {
"message": "Entrou"
},
@@ -2582,9 +2579,6 @@
"profile.label.organizations": {
"message": "Organizações"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural,one {projeto} other {projetos}}"
},
"profile.label.saving": {
"message": "A guardar..."
},
+13 -19
View File
@@ -69,7 +69,7 @@
"message": "Разбивка: {breakdown}"
},
"analytics.chart.action.show-all": {
"message": "Показать все"
"message": "Показать всё"
},
"analytics.chart.action.show-limited": {
"message": "Показать меньше"
@@ -114,7 +114,7 @@
"message": "Доли"
},
"analytics.chart.empty.select-table-items": {
"message": "Выберите элементы из таблицы ниже, чтобы отобразить данные."
"message": "Выберите элементы из таблицы ниже, чтобы отобразить данные."
},
"analytics.chart.events.count-aria": {
"message": "{count, plural, one {# событие аналитики} few {# события аналитики} other {# событий аналитики}}"
@@ -123,7 +123,7 @@
"message": "<project>{projectName}</project>: {title}"
},
"analytics.chart.events.see-announcement": {
"message": "Перейти к объявлению"
"message": "Перейти к объявлению"
},
"analytics.chart.legend.monetization-details.aria": {
"message": "Посмотреть сведения о монетизации"
@@ -138,7 +138,7 @@
"message": "{name} (пред.)"
},
"analytics.chart.render-limit.description": {
"message": "Если показать все выбранные строки, страница может работать медленнее."
"message": "Отображение всех выбранных строк из таблицы может замедлить страницу."
},
"analytics.chart.table-selection.all": {
"message": "Показаны все {itemType, select,\n project {проекты}\n country {страны}\n monetization {типы монетизации}\n downloadSource {источники скачивания}\n downloadReason {причины скачивания}\n member {участники}\n projectVersion {версии проекта}\n loader {загрузчики}\n gameVersion {версии игры}\n other {элементы}\n} из таблицы"
@@ -171,7 +171,7 @@
"message": "Скрыть {name} на диаграмме"
},
"analytics.chart.tooltip.pinned": {
"message": "Подсказка диаграммы закреплена"
"message": "Подсказка графика закреплена"
},
"analytics.chart.tooltip.pinned-aria": {
"message": "Закреплено"
@@ -210,7 +210,7 @@
"message": "Modrinth App"
},
"analytics.download-source.website": {
"message": "Сайт Modrinth"
"message": "Веб-сайт Modrinth"
},
"analytics.downloads.suffix": {
"message": "скачиваний"
@@ -798,7 +798,7 @@
"message": "Отправить письмо"
},
"auth.reset-password.method-choice.description": {
"message": "Введите свою почту, чтобы получить ссылку для восстановления доступа к аккаунту."
"message": "Введите почту, чтобы получить ссылку для восстановления доступа к аккаунту."
},
"auth.reset-password.notification.email-sent.text": {
"message": "Если почта привязана к аккаунту, на неё придёт письмо с инструкциями."
@@ -2666,6 +2666,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "Перейти на Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "Перед публикацией на Modrinth необходимо подтвердить адрес электронной почты."
},
"layout.publish.email-verification-required.title": {
"message": "Необходимо подтвердить почту"
},
"moderation.exclude-technical-review": {
"message": "Исключать ТП"
},
@@ -3059,9 +3065,6 @@
"profile.label.collection": {
"message": "Коллекция"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {скачивание} few {скачивания} other {скачиваний}}"
},
"profile.label.joined": {
"message": "Регистрация:"
},
@@ -3080,9 +3083,6 @@
"profile.label.organizations": {
"message": "Организации"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {проект} few {проекта} other {проектов}}"
},
"profile.label.saving": {
"message": "Сохранение..."
},
@@ -3647,12 +3647,6 @@
"project.settings.visit-dashboard": {
"message": "Управление проектами"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {загрузка} few {загрузки} other {загрузок}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {подписчик} few {подписчика} other {подписчиков}}"
},
"project.status.archived.message": {
"message": "{title} помещён в архив. {title} больше не будет получать обновления, если только автор не решит разархивировать проект."
},
+354
View File
@@ -101,6 +101,12 @@
"analytics.chart.controls.modrinth-events": {
"message": "Modrinth događaji"
},
"analytics.chart.controls.no-modrinth-events": {
"message": "Nema Modrinth događaja na grafu."
},
"analytics.chart.controls.no-project-events": {
"message": "Nema događaja projekta u grafu."
},
"analytics.chart.controls.previous-period": {
"message": "Prethodni period"
},
@@ -110,6 +116,15 @@
"analytics.chart.controls.ratio": {
"message": "Odnos"
},
"analytics.chart.empty.select-table-items": {
"message": "Izaberi stavke iz tabele ispod da bi prikazao svoje podatke."
},
"analytics.chart.events.count-aria": {
"message": "{count, plural, one {# događaj analitike} other{# događaja analitike}}"
},
"analytics.chart.events.project-title": {
"message": "<project>{projectName}</project>: {title}"
},
"analytics.chart.events.see-announcement": {
"message": "Pogledaj obaveštenje"
},
@@ -167,15 +182,48 @@
"analytics.download-source.app": {
"message": "Modrinth aplikacija"
},
"analytics.download-source.website": {
"message": "Modrinth veb-stranica"
},
"analytics.downloads.suffix": {
"message": "preuzimanja"
},
"analytics.filter.game-version-type": {
"message": "Tip verzije igre"
},
"analytics.filter.game-version-type.all": {
"message": "Sve"
},
"analytics.filter.game-version-type.release": {
"message": "Izdanja"
},
"analytics.filter.search.countries": {
"message": "Traži države..."
},
"analytics.filter.search.dependent-projects": {
"message": "Traži projekte..."
},
"analytics.filter.search.download-sources": {
"message": "Traži izvore preuzimanja..."
},
"analytics.filter.search.members": {
"message": "Traži članove..."
},
"analytics.filter.search.project-versions": {
"message": "Traži verzije projekta..."
},
"analytics.filter.search.versions": {
"message": "Traži verzije..."
},
"analytics.graph.title.downloads": {
"message": "Preuzimanja preko vremena"
},
"analytics.graph.title.playtime": {
"message": "Vreme igranja preko vremena"
},
"analytics.graph.title.views": {
"message": "Pregledi preko vremena"
},
"analytics.group-by.1h": {
"message": "1 sat"
},
@@ -215,6 +263,51 @@
"analytics.group-by.year": {
"message": "Godina"
},
"analytics.options.loading": {
"message": "Učitavanje..."
},
"analytics.project-event.project-approved": {
"message": "Projekat odobren"
},
"analytics.project-event.project-unlisted": {
"message": "Projekat nenaveden"
},
"analytics.project-event.version-released": {
"message": "{version} izdana"
},
"analytics.project-event.version-uploaded": {
"message": "Verzija postavljena"
},
"analytics.project-status.approved": {
"message": "Odobreno"
},
"analytics.project-status.archived": {
"message": "Arhivirano"
},
"analytics.project-status.draft": {
"message": "Nacrt"
},
"analytics.project-status.other": {
"message": "Drugo"
},
"analytics.project-status.private": {
"message": "Privatno"
},
"analytics.project-status.rejected": {
"message": "Odbijeno"
},
"analytics.project-status.unlisted": {
"message": "Nenavedeno"
},
"analytics.project-status.withheld": {
"message": "Zadržano"
},
"analytics.project.all": {
"message": "Svi projekati"
},
"analytics.project.count": {
"message": "{count, plural, one {# projekat} few {# projekta} other {# projekata}}"
},
"analytics.project.icon-alt": {
"message": "Ikona {name}"
},
@@ -230,12 +323,21 @@
"analytics.query.filter.add": {
"message": "Dodaj filter"
},
"analytics.query.label.breakdown": {
"message": "Raščlanjivanje:"
},
"analytics.query.label.grouped-by": {
"message": "Grupirano po"
},
"analytics.query.label.project": {
"message": "Projekat:"
},
"analytics.query.label.timeframe": {
"message": "Okvir vremena:"
},
"analytics.stat.downloads": {
"message": "Preuzimanja"
},
"analytics.stat.monetization-banner.learn-more": {
"message": "Saznaj više"
},
@@ -260,24 +362,48 @@
"analytics.stat.unavailable": {
"message": "N/A"
},
"analytics.stat.views": {
"message": "Pogledi"
},
"analytics.table.csv.date-range": {
"message": "Od {start} do {end}"
},
"analytics.table.csv.header.playtime-seconds": {
"message": "Vreme igranja (sekunde)"
},
"analytics.table.csv.selected-range": {
"message": "Izabran okvir"
},
"analytics.table.duration.days": {
"message": "{count, plural, one {# dan} other {# dana}}"
},
"analytics.table.duration.hours": {
"message": "{count, plural, one {# sat} few {# sata} other {# sati}}"
},
"analytics.table.empty.no-matching-rows": {
"message": "Nema odgovarajućih redova za analitiku"
},
"analytics.table.export.cumulative": {
"message": "Komulativno"
},
"analytics.table.export.grouped": {
"message": "Grupirano po {groupBy}"
},
"analytics.table.pagination.summary": {
"message": "Pokazivanje ukupno od {start} do {end} od {total}"
},
"analytics.table.search.placeholder": {
"message": "Pretraži..."
},
"analytics.threshold.country-downloads-aria": {
"message": "Prag preuzimanja po državi"
},
"analytics.title": {
"message": "Analitike"
},
"analytics.value.monetized": {
"message": "Monetizovano"
},
"analytics.value.no-dependent": {
"message": "Bez"
},
@@ -290,6 +416,9 @@
"analytics.value.unknown": {
"message": "Nepoznato"
},
"analytics.value.unmonetized": {
"message": "Bez monetizacije"
},
"app-marketing.download.description": {
"message": "Naša desktop aplikacija je dostupna na svim platformama, izaberi željenu verziju."
},
@@ -329,6 +458,15 @@
"app-marketing.features.follow.title": {
"message": "Prati projekte"
},
"app-marketing.features.importing.gdlauncher-alt": {
"message": "GDLauncher"
},
"app-marketing.features.importing.multimc-alt": {
"message": "MultiMC"
},
"app-marketing.features.mod-management.description": {
"message": "Modrinth olakšava upravljanje svim tvojim modovima na jednom mestu. Modove možeš da instaliraš, uklanjaš i ažuriraš samo jednim klikom."
},
"app-marketing.features.mod-management.installed-mods": {
"message": "Instalirani modovi"
},
@@ -347,24 +485,84 @@
"app-marketing.features.offline.description": {
"message": "Igraj svoje modove, bez obzira da li si povezani na internet ili ne."
},
"app-marketing.features.offline.title": {
"message": "Oflajn režim"
},
"app-marketing.features.open-source.title": {
"message": "Otvoreni kod"
},
"app-marketing.features.performance.activity-monitor": {
"message": "Praćenje aktivnosti"
},
"app-marketing.features.performance.cpu-percent": {
"message": "% procesora"
},
"app-marketing.features.performance.discord": {
"message": "Discord"
},
"app-marketing.features.performance.good-performance": {
"message": "Dobar performanse"
},
"app-marketing.features.performance.google-chrome": {
"message": "Google Chrome"
},
"app-marketing.features.performance.infinite-mb": {
"message": "∞ MB"
},
"app-marketing.features.performance.infinite-times-infinite-mb": {
"message": "∞ × ∞ MB"
},
"app-marketing.features.performance.less-than-150mb": {
"message": "< 150 MB"
},
"app-marketing.features.performance.modrinth-app": {
"message": "Modrinth aplikacija"
},
"app-marketing.features.performance.one-billion-percent": {
"message": "1 milijarda %"
},
"app-marketing.features.performance.process-name": {
"message": "Ime procesa"
},
"app-marketing.features.performance.ram": {
"message": "RAM / radna memorija"
},
"app-marketing.features.performance.small": {
"message": "Malo"
},
"app-marketing.features.sharing.modpack": {
"message": "Modpack"
},
"app-marketing.features.sharing.share-button": {
"message": "Deli"
},
"app-marketing.features.sharing.title": {
"message": "Deli modpackove"
},
"app-marketing.hero.app-screenshot-alt": {
"message": "Snimak ekrana Modrinth aplikacije sa otvorenom instancom Cobblemona na stranici Sadržaja."
},
"app-marketing.hero.download-button": {
"message": "Preuzmi Modrinth aplikaciju"
},
"app-marketing.hero.download-modrinth-app": {
"message": "Preuzmi Modrinth aplikaciju"
},
"app-marketing.hero.download-modrinth-app-for-os": {
"message": "Preuzmi Modrinth aplikaciju za {os}"
},
"app-marketing.hero.minecraft-screenshot-alt": {
"message": "Snimak ekrana glavnog menija instance Cobblemona."
},
"app-marketing.hero.more-download-options": {
"message": "Više opcije preuzimanja"
},
"app-marketing.hide-other-packages": {
"message": "Krij druge pakete"
},
"app-marketing.show-other-packages": {
"message": "Pokazuj druge pakete"
},
"auth.authorize.action.authorize": {
"message": "Odobri"
},
@@ -380,9 +578,36 @@
"auth.authorize.error.no-redirect-url": {
"message": "Nije pronađena lokacija za preusmeravanje u odgovoru"
},
"auth.authorize.errro-title": {
"message": "Došlo je do greške"
},
"auth.authorize.redirect-url": {
"message": "Bićeš preusmeren na <redirect-url>{url}</redirect-url>"
},
"auth.continue-with-provider": {
"message": "Nastavi sa {provider}"
},
"auth.create-account.complete-sign-up": {
"message": "Završi prijavu"
},
"auth.create-account.date-of-birth.invalid.text": {
"message": "Molimo upiši važeći datum rođenja. Godina nemože biti 0000."
},
"auth.create-account.date-of-birth.invalid.title": {
"message": "Nevažeći datum rođenja"
},
"auth.create-account.date-of-birth.label": {
"message": "Datum rođenja"
},
"auth.create-account.date-of-birth.placeholder": {
"message": "Ukucaj svoj datum rođenja"
},
"auth.create-account.date-of-birth.required.title": {
"message": "Potreban je datum rođenja"
},
"auth.create-account.page-title": {
"message": "Kreiraj račun"
},
"auth.reset-password.method-choice.action": {
"message": "Pošalji email za oporavak"
},
@@ -503,6 +728,12 @@
"create.project.type-server": {
"message": "Server"
},
"dashboard.analytics.total-downloads": {
"message": "Ukupan broj preuzimanja"
},
"dashboard.analytics.total-followers": {
"message": "Ukupan broj pratilaca"
},
"dashboard.collections.button.create-new": {
"message": "Kreiraj novo"
},
@@ -512,6 +743,12 @@
"dashboard.collections.long-title": {
"message": "Tvoje kolekcije"
},
"dashboard.creator-withdraw-modal.method-selection.country-placeholder": {
"message": "Izaberi svoju državu"
},
"dashboard.creator-withdraw-modal.method-selection.country-search-placeholder": {
"message": "Traži države..."
},
"dashboard.projects.bulk-edit.server-disabled": {
"message": "Serverski projekti ne podržavaju grupno uređivanje"
},
@@ -527,6 +764,15 @@
"dashboard.projects.links.placeholder.cleared": {
"message": "Postojeća veza će biti uklonjena"
},
"dashboard.sidebar.label.analytics": {
"message": "Analitike"
},
"dashboard.withdraw.error.paypal-country-mismatch.text": {
"message": "Molimo te da koristiš odgovarajuću opciju za PayPal transfer za tvoj region (SAD ili međunarodni)."
},
"dashboard.withdraw.error.paypal-country-mismatch.title": {
"message": "Nepoklapanje regiona PayPala"
},
"discover.install.back-to-server": {
"message": "Nazad na server"
},
@@ -749,6 +995,9 @@
"landing.heading.the-place-for-minecraft.servers": {
"message": "serveri"
},
"layout.action.analytics-events": {
"message": "Analitički događaji"
},
"layout.action.change-theme": {
"message": "Promeni temu"
},
@@ -911,6 +1160,69 @@
"moderation.page.reports": {
"message": "Izvještaji"
},
"muralpay.country.at": {
"message": "Austrija"
},
"muralpay.country.be": {
"message": "Belgija"
},
"muralpay.country.cy": {
"message": "Kipar"
},
"muralpay.country.de": {
"message": "Nemačka"
},
"muralpay.country.ee": {
"message": "Estonija"
},
"muralpay.country.es": {
"message": "Španija"
},
"muralpay.country.fi": {
"message": "Finska"
},
"muralpay.country.fr": {
"message": "Francuska"
},
"muralpay.country.gr": {
"message": "Grčka"
},
"muralpay.country.ie": {
"message": "Irska"
},
"muralpay.country.it": {
"message": "Italija"
},
"muralpay.country.lt": {
"message": "Litvanija"
},
"muralpay.country.lu": {
"message": "Luksemburg"
},
"muralpay.country.lv": {
"message": "Letonija"
},
"muralpay.country.mt": {
"message": "Malta"
},
"muralpay.country.nl": {
"message": "Holandija"
},
"muralpay.country.pt": {
"message": "Portugal"
},
"muralpay.country.sk": {
"message": "Slovačka"
},
"muralpay.field.country": {
"message": "Država"
},
"muralpay.field.phone-number": {
"message": "Broj telefona"
},
"profile.button.analytics": {
"message": "Pregled analitike korisnika"
},
"profile.button.billing": {
"message": "Upravljaj naplatom korisnika"
},
@@ -1145,6 +1457,9 @@
"scopes.analytics.label": {
"message": "Pristup analitici"
},
"scopes.category.analytics": {
"message": "Analitike"
},
"scopes.collectionCreate.description": {
"message": "Omogućava kreiranje kolekcija"
},
@@ -1421,12 +1736,45 @@
"settings.account.delete.section.description": {
"message": "Kad obrišeš svoj račun, povratka nema. Brisanjem računa sa naših servera biće uklonjeni svi povezani podaci, izuzev projekata."
},
"settings.applications.head-title": {
"message": "Aplikacije"
},
"settings.applications.modal.header": {
"message": "Informacije aplikacije"
},
"settings.authorizations.about-this-app": {
"message": "O ovoj aplikaciji"
},
"settings.authorizations.by": {
"message": "od"
},
"settings.authorizations.revoke.action": {
"message": "Oduzmi"
},
"settings.billing.charges.product.medal-trial": {
"message": "Probna verzija Medal servera"
},
"settings.billing.charges.product.midas": {
"message": "Modrinth Plus"
},
"settings.billing.interval.month": {
"message": "mesec"
},
"settings.billing.interval.year": {
"message": "godina"
},
"settings.billing.midas.benefits.ad-free": {
"message": "Pregledavanje na modrinth.com i Modrinth aplikaciji bez reklama"
},
"settings.billing.midas.benefits.badge": {
"message": "Modrinth+ oznaka na tvom profilu"
},
"settings.billing.midas.save-per-year": {
"message": "Uštedi {amount} godišnje prelaskom na godišnju naplatu!"
},
"settings.billing.midas.status.cancelled.line1": {
"message": "Otkazali smo tvoju pretplatu."
},
"settings.billing.midas.upsell": {
"message": "Postani pretplatnik na Modrinth Plus!"
},
@@ -1778,12 +2126,18 @@
"version.dependency.view-version": {
"message": "Vidi verziju"
},
"version.download.download-dependency": {
"message": "Izaberi verziju za instalaciju"
},
"version.download.optional-resource-pack": {
"message": "Opcioni resurs paket"
},
"version.download.required-resource-pack": {
"message": "Potreban paket resursa"
},
"version.download.version": {
"message": "Instaliraj {version} ({size})"
},
"version.edit.button": {
"message": "Promeni"
},
+79 -10
View File
@@ -401,6 +401,9 @@
"analytics.threshold.game-versions-above": {
"message": "Spelversioner ovan"
},
"analytics.threshold.project-versions-above": {
"message": "Projektversioner ovan"
},
"analytics.threshold.projects-above": {
"message": "Projekt ovan"
},
@@ -641,11 +644,14 @@
"auth.continue-with-provider": {
"message": "Fortsätt med {provider}"
},
"auth.create-account.age-requirement.warning-title": {
"message": "Ålderskrav"
},
"auth.create-account.complete-sign-up": {
"message": "Avsluta registrering"
},
"auth.create-account.date-of-birth.invalid.text": {
"message": "Vänligen skriv in ett giltligt födelsedatum. Året kan inte vara 0000."
"message": "Vänligen ange ett giltigt födelsedatum. Året kan inte vara 0000."
},
"auth.create-account.date-of-birth.invalid.title": {
"message": "Ogiltligt födelsedatum"
@@ -657,11 +663,14 @@
"message": "Välj ditt födelsedatum"
},
"auth.create-account.date-of-birth.required.text": {
"message": "Vänligen skriv in ditt födelsedatum innan du fortsätter."
"message": "Vänligen ange ditt födelsedatum innan du fortsätter."
},
"auth.create-account.date-of-birth.required.title": {
"message": "Födelsedatum behövs"
},
"auth.create-account.date-of-birth.under13-helper": {
"message": "Du uppfyller inte ålderskravet för att skapa ett konto hos Modrinth."
},
"auth.create-account.info-panel.source-code-link": {
"message": "Relevand källkod"
},
@@ -671,6 +680,9 @@
"auth.create-account.page-title": {
"message": "Skapa konto"
},
"auth.create-account.security-check.label": {
"message": "Säkerhetskontroll"
},
"auth.create-account.subscribe.label": {
"message": "Håll mig uppdaterad om de coola sakerna Modrinth arbetar på via e-post"
},
@@ -687,7 +699,7 @@
"message": "Skicka återställningsmejl"
},
"auth.reset-password.method-choice.description": {
"message": "Skriv in din e-post nedan så skickar vi en återställningslänk som låter dig återställa ditt konto."
"message": "Ange din e-post nedan så skickar vi en återställningslänk som låter dig återställa ditt konto."
},
"auth.reset-password.notification.email-sent.text": {
"message": "Ett e-postmeddelande med instruktioner har skickats till dig om din e-post tidigare har sparats på ditt konto."
@@ -717,7 +729,7 @@
"message": "Återställ ditt lösenord"
},
"auth.sign-in.2fa.description": {
"message": "Ange 6-siffriga koden från din autentiseringsapp, eller en av dina reservkoder."
"message": "Ange den 6-siffriga koden från din autentiseringsapp eller en av dina reservkoder."
},
"auth.sign-in.2fa.label": {
"message": "Tvåfaktorsautentisering"
@@ -1535,9 +1547,18 @@
"dashboard.projects.links.header.edit": {
"message": "Redigera länkar"
},
"dashboard.projects.links.placeholder.valid-discord-url": {
"message": "Ange en giltig URL för Discordinbjudan"
},
"dashboard.projects.links.placeholder.valid-url": {
"message": "Ange en giltig URL"
},
"dashboard.projects.links.show-all-projects": {
"message": "Visa alla projekt"
},
"dashboard.projects.links.source-code.description": {
"message": "En sida/kodförråd som innehåller källkoden till ditt projekt"
},
"dashboard.projects.links.source-code.label": {
"message": "Källkod"
},
@@ -1550,6 +1571,18 @@
"dashboard.projects.project.icon-alt": {
"message": "Ikon för {title}"
},
"dashboard.projects.project.moderator-message-aria": {
"message": "Projektet har ett meddelande från moderatorerna. Se projektet för att se mer."
},
"dashboard.projects.project.review-environment-metadata": {
"message": "Vänligen verifiera miljömetadata"
},
"dashboard.projects.selection-bar.aria-label": {
"message": "Valda projektåtgärder"
},
"dashboard.projects.selection-bar.selected-count": {
"message": "{count,plural,one{# projekt valt}other{# projekt valda}}"
},
"dashboard.projects.table.id": {
"message": "ID"
},
@@ -1604,12 +1637,18 @@
"dashboard.revenue.transactions.btn.download-csv": {
"message": "Ladda ner som CSV"
},
"dashboard.revenue.transactions.head-title": {
"message": "Transaktionshistorik"
},
"dashboard.revenue.transactions.header": {
"message": "Transaktioner"
},
"dashboard.revenue.transactions.none": {
"message": "Inga transaktioner"
},
"dashboard.revenue.transactions.none.desc": {
"message": "Dina utbetalningar och utdrag kommer synas här."
},
"dashboard.revenue.transactions.period.last-month": {
"message": "Senaste månaden"
},
@@ -1634,6 +1673,9 @@
"dashboard.sidebar.label.analytics": {
"message": "Statistik"
},
"dashboard.sidebar.label.creators": {
"message": "Skapare"
},
"dashboard.sidebar.label.dashboard": {
"message": "Kontrollpanel"
},
@@ -1742,6 +1784,9 @@
"discover.install.back-to-server": {
"message": "Tillbaka till server"
},
"discover.seo.description": {
"message": "Sök och bläddra bland tusen av Minecraft {projectType} på Modrinth med snabba, träffsäkra resultat. Våra filter hjälper dig att snabbt hitta de bästa Minecraft {projectType}."
},
"discover.seo.title": {
"message": "Sök {projectType}"
},
@@ -1910,6 +1955,9 @@
"hosting-marketing.faq.location": {
"message": "Var finns Modrinth Hostings servrar? Kan jag välja region?"
},
"hosting-marketing.faq.location.answer": {
"message": "Vi har servrar tillgängliga runtom i Nordamerika, Europa, Sydostasien och Australien för tillfället som du kan välja vid köp. Fler regioner kommer i framtiden! Om du skulle vilja byta din region, vänligen kontakta support."
},
"hosting-marketing.faq.versions-loaders": {
"message": "Vilka Minecraft versioner och loaders kan användas?"
},
@@ -2459,6 +2507,15 @@
"modpack-scan-modal.not-scanned": {
"message": "Inte skannad"
},
"modpack-scan-modal.scan-all-files": {
"message": "Skanna alla filer"
},
"modpack-scan-modal.scan-error": {
"message": "Några filer kunde inte skannas: {error}"
},
"modpack-scan-modal.scanning": {
"message": "Skannar..."
},
"muralpay.account-type.checking": {
"message": "Checkkonto"
},
@@ -2534,6 +2591,12 @@
"muralpay.field.account-number": {
"message": "Kontonummer"
},
"muralpay.field.account-number-cbu-cvu": {
"message": "Kontonummer (CBU/CVU)"
},
"muralpay.field.account-number-cci": {
"message": "Kontonummer (CCI)"
},
"muralpay.field.account-number-type": {
"message": "Kontonummerstyp"
},
@@ -2570,8 +2633,11 @@
"muralpay.pix-type.phone": {
"message": "Telefonnummer"
},
"muralpay.placeholder.account-number": {
"message": "Ange kontonummer"
},
"muralpay.placeholder.enter-account-number": {
"message": "Skriv in kontonummer"
"message": "Ange kontonummer"
},
"muralpay.placeholder.pix-phone": {
"message": "+55..."
@@ -2672,9 +2738,6 @@
"profile.label.collection": {
"message": "Samling"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {nedladdning} other {nedladdningar}}"
},
"profile.label.joined": {
"message": "Gick med"
},
@@ -2912,6 +2975,9 @@
"project.download.title": {
"message": "Ladda ner {title}"
},
"project.download.zip-failed-title": {
"message": "Kunde inte ladda ner filer"
},
"project.environment.migration-no-permission.message": {
"message": "Vi har förbättrat miljösystemet på Modrinth och nya inställningar är tillgängliga. Du har inte behörighet att ändra dessa inställningar, men meddela en annan medlem i projektet att miljömetadatan måste verifieras."
},
@@ -3014,6 +3080,9 @@
"project.settings.general.url.title": {
"message": "URL"
},
"project.settings.permissions.attention-needed.title": {
"message": "Okänt externt innehåll"
},
"project.settings.permissions.learn-more": {
"message": "Läs mer"
},
@@ -3516,10 +3585,10 @@
"message": "Koden du angav är inkorrekt!"
},
"settings.account.two-factor.field.code.description": {
"message": "Ange din tvåfaktorskod för att fortsätta."
"message": "Vänligen ange din tvåfaktorskod för att fortsätta."
},
"settings.account.two-factor.field.code.label": {
"message": "Ange en tvåfaktorskod"
"message": "Ange tvåfaktorskod"
},
"settings.account.two-factor.field.code.placeholder": {
"message": "Ange kod..."
+48 -12
View File
@@ -2681,6 +2681,9 @@
"moderation.page.external-projects": {
"message": "Harici projeler"
},
"moderation.page.global-detail-traces": {
"message": "Global izler"
},
"moderation.page.projects": {
"message": "Projeler"
},
@@ -3065,9 +3068,6 @@
"profile.label.collection": {
"message": "Koleksiyon"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {indirme} other {indirmeler}}"
},
"profile.label.joined": {
"message": "Katılma:"
},
@@ -3086,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organizasyonlar"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {proje} other {projeler}}"
},
"profile.label.saving": {
"message": "Kaydediliyor..."
},
@@ -3281,12 +3278,18 @@
"project.download.base-loader-incompatible-tooltip": {
"message": "Bu yükleyici bu proje ile uyumsuz."
},
"project.download.compatible-version-title": {
"message": "Uyumlu sürümler"
},
"project.download.dependencies-title": {
"message": "Gerekliler"
},
"project.download.dependency-already-installed": {
"message": "Gerekli proje zaten indirilmiş"
},
"project.download.dependency-any-compatible": {
"message": "Herhangi uyumlu"
},
"project.download.dependency-conflicting": {
"message": "Bu gerekli proje başka bir gerekli proje ile çatışıyor"
},
@@ -3308,12 +3311,30 @@
"project.download.dependency-quilt-fabric-api": {
"message": "Quilt'te Fabric API'ye gerek yok"
},
"project.download.dependency-resource-pack-admonition": {
"message": "Bu proje bir kaynak paketine bağımlıdır. Kaynak paketini indirin ve {folder} klasörüne yerleştirin."
},
"project.download.dependency-unavailable": {
"message": "Bu bağımlılık indirilemez"
},
"project.download.download": {
"message": "İndir"
},
"project.download.download-as-zip": {
"message": ".zip olarak indir"
},
"project.download.download-version": {
"message": "İndir {version}"
},
"project.download.download-with-dependencies": {
"message": "Bağımlı olanlarla indir"
},
"project.download.download-with-recommended": {
"message": "Tavsiye edilenle indir"
},
"project.download.download-with-recommended-as-zip": {
"message": "Tavsiye edilenle .zip olarak indir"
},
"project.download.duplicate-dependencies-hidden": {
"message": "Yinelenen bağımlılıklar gizlendi."
},
@@ -3323,6 +3344,9 @@
"project.download.game-version-unsupported-tooltip": {
"message": "{title}, {platform} için {gameVersion} sürümünü desteklemiyor"
},
"project.download.install-with-app": {
"message": "Modrinth App'le indir"
},
"project.download.manually": {
"message": "Manuel Yükle"
},
@@ -3332,9 +3356,21 @@
"project.download.no-game-versions-found": {
"message": "Oyun sürümleri bulunamadı"
},
"project.download.no-versions-available": {
"message": "{gameVersion} ve {platform} için uyumlu sürüm yok."
},
"project.download.platform-unsupported-tooltip": {
"message": "{title}, {gameVersion} sürümünde {platform} desteklemiyor"
},
"project.download.recommended-title": {
"message": "Önerilen"
},
"project.download.required-resource-pack-admonition": {
"message": "Bu data paketi bir kaynak paketine bağımlıdır. Kaynak paketini indirin ve {folder} klasörüne yerleştirin."
},
"project.download.required-resource-pack-short": {
"message": "Kaynak paketi"
},
"project.download.search-game-versions": {
"message": "Oyun sürümü seç"
},
@@ -3353,6 +3389,12 @@
"project.download.unknown-loader": {
"message": "Bilinmeyen yükleyici"
},
"project.download.zip-failed-text": {
"message": "Bir veya daha fazla dosya indirilemedi. Lütfen tekrar deneyin."
},
"project.download.zip-failed-title": {
"message": "Dosyalar indirilemedi"
},
"project.environment.migration-no-permission.message": {
"message": "Daha yeni Modrinth'in Çevre sistemini yeniledik ve yeni seçenekler mevcut. Bu ayarları değiştirmek için yetkiniz yok ama projenin başka bir üyesine çevre meta verisinin doğrulanması gerektiği haberini verebilirsiniz."
},
@@ -3554,12 +3596,6 @@
"project.settings.visit-dashboard": {
"message": "Projeler panelini ziyaret et"
},
"project.stats.downloads-label": {
"message": "{count, plural, one {download} other {downloads}}"
},
"project.stats.followers-label": {
"message": "{count, plural, one {follower} other {followers}}"
},
"project.status.archived.message": {
"message": "{title} arşivlenmiş. {title}, yapımcı fikrini değiştirmediği sürece daha fazla güncelleme almayacak."
},
File diff suppressed because it is too large Load Diff
+6 -12
View File
@@ -134,6 +134,12 @@
"analytics.chart.render-limit.header": {
"message": "Hiện thị tất cả {count} đường trong biểu đồ?"
},
"analytics.chart.table-selection.all": {
"message": "Đang hiện mọi {itemType, select, project {{count, plural, other {dự án}}} country {{count, plural, other {quốc gia}}} monetization {{count, plural, other {giá trị doanh thu}}} downloadSource {{count, plural, other {nguồn tải}}} downloadReason {{count, plural, other {lý do tải}}} member {{count, plural, other {thành viên}}} projectVersion {{count, plural, other {phiên bản dự án}}} loader {{count, plural, other {mod loader}}} gameVersion {{count, plural, other {phiên bản trò chơi}}} other {{count, plural, other {vật phẩm}}}} từ bảng"
},
"analytics.chart.table-selection.count": {
"message": "Đang hiện {count} {itemType, select, project {{count, plural, other {dự án}}} country {{count, plural, other {quốc gia}}} monetization {{count, plural, other {giá trị doanh thu}}} downloadSource {{count, plural, other {nguồn tải}}} downloadReason {{count, plural, other {lý do tải}}} member {{count, plural, other {thành viên}}} projectVersion {{count, plural, other {phiên bản dự án}}} loader {{count, plural, other {mod loader}}} gameVersion {{count, plural, other {phiên bản trò chơi}}} other {{count, plural, other {vật phẩm}}}} từ bảng"
},
"analytics.chart.tooltip.duration.days": {
"message": "{count, plural, other {# ngày}}"
},
@@ -2855,9 +2861,6 @@
"profile.label.collection": {
"message": "Bộ sưu tập"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, one {lượt tải xuống} other {lượt tải xuống}}"
},
"profile.label.joined": {
"message": "Đã tham gia"
},
@@ -2876,9 +2879,6 @@
"profile.label.organizations": {
"message": "Tổ chức"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, one {dự án} other {dự án}}"
},
"profile.label.saving": {
"message": "Đang lưu..."
},
@@ -3278,12 +3278,6 @@
"project.settings.visit-dashboard": {
"message": "Truy cập bảng điều khiển dự án"
},
"project.stats.downloads-label": {
"message": "{count, plural, other {lượt tải}}"
},
"project.stats.followers-label": {
"message": "{count, plural, other {lượt theo dõi}}"
},
"project.status.archived.message": {
"message": "{title} đã được lưu trữ. {title} sẽ không nhận được bất kỳ bản cập nhật nào trong tương lai trừ khi tác giả quyết định hủy lưu trữ dự án."
},
+10 -16
View File
@@ -81,7 +81,7 @@
"message": "{hours}小时"
},
"analytics.chart.controls.active-count": {
"message": "在线{count}"
"message": "显示{count}"
},
"analytics.chart.controls.annotations": {
"message": "注释"
@@ -2082,10 +2082,10 @@
"message": "按年支付"
},
"hosting-marketing.faq.burst-threads": {
"message": "CPU 发线程是如何工作的?"
"message": "CPU 发线程是怎样运作的?"
},
"hosting-marketing.faq.burst-threads.answer": {
"message": "当的服务器处于高负载状态时,我们会临时为其分配额外的 CPU 线程,以帮助缓解卡顿和性能不稳定。这有助于防止 TPS 降至 20 以下,从而尽确保玩家体验。由于这些额外 CPU 线程仅会在高负载期间短暂提供,因此它们可能不会显示在 Spark 报告或其他性能分析工具。"
"message": "当的服务器负载过高时,我们会暂时让它使用额外的 CPU 线程,帮你缓解延迟飙升与不稳定的问题。这有助于防止 TPS 掉到 20 以下,尽可能确保你获得最流畅的体验。由于只有在高负载期间,这些额外 CPU 线程才会短暂出现,所以 Spark 性能分析工具可能不会显示出这些线程。"
},
"hosting-marketing.faq.cpu-kind": {
"message": "Modrinth Hosting 服务器是在哪种 CPU 上运行的?"
@@ -2669,6 +2669,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "升级至 Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "您必须先验证您的电子邮箱才能在 Modrinth 上发布内容。"
},
"layout.publish.email-verification-required.title": {
"message": "需要验证电子邮件"
},
"moderation.exclude-technical-review": {
"message": "排除技术评审"
},
@@ -3062,9 +3068,6 @@
"profile.label.collection": {
"message": "收藏夹"
},
"profile.label.downloads": {
"message": "{count} {countPlural, plural, other {次下载}}"
},
"profile.label.joined": {
"message": "加入于"
},
@@ -3083,9 +3086,6 @@
"profile.label.organizations": {
"message": "组织"
},
"profile.label.projects": {
"message": "{count} {countPlural, plural, other {个项目}}"
},
"profile.label.saving": {
"message": "正在保存…"
},
@@ -3650,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "访问项目的控制面板"
},
"project.stats.downloads-label": {
"message": "{count, plural, other {下载}}"
},
"project.stats.followers-label": {
"message": "{count, plural, other {关注者}}"
},
"project.status.archived.message": {
"message": "{title} 已归档。除非作者决定取消归档,否则 {title} 将不再更新。"
},
@@ -4566,7 +4560,7 @@
"message": "{price} / {interval}"
},
"settings.billing.pyro.cpu": {
"message": "{shared} 共享 CPU突发高达 {bursts} CPU"
"message": "{shared} 共享 CPU爆发时最多 {bursts} CPU"
},
"settings.billing.pyro.linked-server.not-found": {
"message": "我们未能找到与此订阅关联的服务器。可能存在以下几种情况:若你刚刚购买服务器,此为正常现象,服务器配置可能需要一小时左右;若你已购买一段时间,服务器可能已被停用。如有不符预期的情况,请提供以下信息联系 Modrinth 支持团队:"
+6 -12
View File
@@ -2672,6 +2672,12 @@
"layout.nav.upgrade-to-modrinth-plus": {
"message": "升級至 Modrinth+"
},
"layout.publish.email-verification-required.description": {
"message": "在 Modrinth 上發行內容之前,你必須先驗證你的電子郵件地址。"
},
"layout.publish.email-verification-required.title": {
"message": "需要驗證電子郵件地址"
},
"moderation.exclude-technical-review": {
"message": "排除技術審查"
},
@@ -3068,9 +3074,6 @@
"profile.label.collection": {
"message": "收藏"
},
"profile.label.downloads": {
"message": "下載次數:{count}"
},
"profile.label.joined": {
"message": "加入時間:"
},
@@ -3089,9 +3092,6 @@
"profile.label.organizations": {
"message": "組織"
},
"profile.label.projects": {
"message": "{count} 個{countPlural, plural, other {專案}}"
},
"profile.label.saving": {
"message": "儲存中..."
},
@@ -3656,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "前往專案資訊主頁"
},
"project.stats.downloads-label": {
"message": "{count, plural, other {下載}}"
},
"project.stats.followers-label": {
"message": "{count, plural, other {追蹤者}}"
},
"project.status.archived.message": {
"message": "{title} 已封存。{title} 將不會再收到任何後續更新,除非作者決定解除封存該專案。"
},
+226 -258
View File
@@ -130,29 +130,27 @@
@set-processing="setProcessing"
/>
</div>
<ProjectHeader
<ProjectPageHeader
v-if="projectV3Loaded"
:project="project"
:project-v3="projectV3"
:member="!!currentMember"
:show-status-badge="!!currentMember || project.status !== 'approved'"
@category="(category) => router.push(`${projectSearchUrl}?f=categories:${category}`)"
>
<template #actions>
<ButtonStyled v-if="auth.user && currentMember" size="large" color="brand" circular>
<nuxt-link
v-tooltip="'Edit project'"
:to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
v-tooltip="formatMessage(messages.editProject)"
:to="`${projectPath}/settings`"
class="!font-bold lg:!hidden"
>
<SettingsIcon aria-hidden="true" />
<SettingsIcon />
</nuxt-link>
</ButtonStyled>
<ButtonStyled v-if="auth.user && currentMember" size="large" color="brand">
<nuxt-link
:to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
class="!font-bold max-lg:!hidden"
>
<SettingsIcon aria-hidden="true" />
Edit project
<nuxt-link :to="`${projectPath}/settings`" class="!font-bold max-lg:!hidden">
<SettingsIcon />
{{ formatMessage(messages.editProject) }}
</nuxt-link>
</ButtonStyled>
@@ -160,20 +158,20 @@
<ButtonStyled
v-if="!isServerProject"
size="large"
:color="
(auth.user && currentMember) || route.name === 'type-project-version-version'
? `standard`
: `brand`
"
:color="projectHeaderPrimaryColor"
:circular="!!auth.user && !!currentMember"
>
<button
v-tooltip="
auth.user && currentMember ? formatMessage(commonMessages.downloadButton) : ''
auth.user && currentMember
? formatMessage(commonMessages.downloadButton)
: undefined
"
@click="(event) => downloadModal.show(event)"
type="button"
:aria-label="formatMessage(commonMessages.downloadButton)"
@click="handleProjectHeaderPrimary"
>
<DownloadIcon aria-hidden="true" />
<DownloadIcon />
{{
auth.user && currentMember ? '' : formatMessage(commonMessages.downloadButton)
}}
@@ -182,19 +180,21 @@
<ButtonStyled
v-else
size="large"
:color="
(auth.user && currentMember) || route.name === 'type-project-version-version'
? `standard`
: `brand`
"
:color="projectHeaderPrimaryColor"
:circular="!!auth.user && !!currentMember"
>
<button
v-tooltip="auth.user && currentMember && !openInAppModal?.open ? 'Play' : ''"
@click="handlePlayServerProject"
v-tooltip="
auth.user && currentMember
? formatMessage(commonMessages.playButton)
: undefined
"
type="button"
:aria-label="formatMessage(commonMessages.playButton)"
@click="handleProjectHeaderPrimary"
>
<PlayIcon aria-hidden="true" />
{{ auth.user && currentMember ? '' : 'Play' }}
<PlayIcon />
{{ auth.user && currentMember ? '' : formatMessage(commonMessages.playButton) }}
</button>
</ButtonStyled>
</div>
@@ -204,109 +204,100 @@
v-if="!isServerProject"
size="large"
circular
:color="
route.name === 'type-project-version-version' || (auth.user && currentMember)
? `standard`
: `brand`
"
:color="projectHeaderPrimaryColor"
>
<button
type="button"
:aria-label="formatMessage(commonMessages.downloadButton)"
class="flex sm:hidden"
@click="(event) => downloadModal.show(event)"
@click="handleProjectHeaderPrimary"
>
<DownloadIcon aria-hidden="true" />
<DownloadIcon />
</button>
</ButtonStyled>
<ButtonStyled
v-else
size="large"
circular
:color="
route.name === 'type-project-version-version' || (auth.user && currentMember)
? `standard`
: `brand`
"
>
<button aria-label="Play" class="flex sm:hidden" @click="handlePlayServerProject">
<PlayIcon aria-hidden="true" />
<ButtonStyled v-else size="large" circular :color="projectHeaderPrimaryColor">
<button
type="button"
:aria-label="formatMessage(commonMessages.playButton)"
class="flex sm:hidden"
@click="handleProjectHeaderPrimary"
>
<PlayIcon />
</button>
</ButtonStyled>
</div>
<Tooltip
v-if="canCreateServerFrom && flags.showProjectPageQuickServerButton"
v-if="
showProjectHeaderCreateServerAction && flags.showProjectPageCreateServersTooltip
"
theme="dismissable-prompt"
class="inline-flex"
:triggers="[]"
:shown="flags.showProjectPageCreateServersTooltip"
:auto-hide="false"
placement="bottom-start"
>
<ButtonStyled size="large" circular>
<ButtonStyled circular size="large">
<nuxt-link
v-tooltip="formatMessage(messages.createServerTooltip)"
:to="`/hosting?project=${project.id}#plan`"
@click="
() => {
flags.showProjectPageCreateServersTooltip = false
saveFeatureFlags()
}
"
:to="projectHeaderCreateServerTo"
:aria-label="formatMessage(messages.serversPromoTitle)"
@click="dismissProjectHeaderCreateServerPrompt"
>
<ServerPlusIcon aria-hidden="true" />
<ServerPlusIcon />
</nuxt-link>
</ButtonStyled>
<template #popper>
<div class="grid grid-cols-[min-content] gap-1">
<div class="flex min-w-60 items-center justify-between gap-4">
<h3
class="m-0 flex items-center gap-2 whitespace-nowrap text-base font-bold text-contrast"
>
{{ formatMessage(messages.serversPromoTitle) }}
<TagItem
:style="{
'--_color': 'var(--color-brand)',
'--_bg-color': 'var(--color-brand-highlight)',
}"
>{{ formatMessage(commonMessages.newBadge) }}</TagItem
<div class="grid max-w-[18rem] gap-2">
<div class="flex items-center justify-between gap-4">
<div class="flex items-center gap-2">
<h3 class="m-0 text-base font-bold text-contrast">
{{ formatMessage(messages.serversPromoTitle) }}
</h3>
<span
class="rounded-full bg-brand-highlight px-2 py-0.5 text-xs font-bold text-brand"
>
</h3>
{{ formatMessage(commonMessages.newBadge) }}
</span>
</div>
<ButtonStyled size="small" circular>
<button
v-tooltip="formatMessage(messages.dontShowAgain)"
@click="
() => {
flags.showProjectPageCreateServersTooltip = false
saveFeatureFlags()
}
"
@click="dismissProjectHeaderCreateServerPrompt"
>
<XIcon aria-hidden="true" />
</button>
</ButtonStyled>
</div>
<p class="m-0 text-wrap text-sm font-medium leading-tight text-secondary">
<p class="m-0 text-sm font-medium leading-tight text-secondary">
{{ formatMessage(messages.serversPromoDescription) }}
</p>
<p class="m-0 text-wrap text-sm font-bold text-primary">
<p class="m-0 text-sm font-semibold text-contrast">
<IntlFormatted
:message-id="messages.serversPromoPricing"
:values="{
price: formatPrice(500, 'USD', true),
}"
:values="{ price: formatPrice(500, 'USD', true) }"
>
<template #small="{ children }">
<span class="text-xs">
<component :is="() => children" />
</span>
<small><component :is="() => children" /></small>
</template>
</IntlFormatted>
</p>
</div>
</template>
</Tooltip>
<ButtonStyled size="large" circular>
<ButtonStyled v-else-if="showProjectHeaderCreateServerAction" circular size="large">
<nuxt-link
v-tooltip="formatMessage(messages.createServerTooltip)"
:to="projectHeaderCreateServerTo"
:aria-label="formatMessage(messages.serversPromoTitle)"
@click="dismissProjectHeaderCreateServerPrompt"
>
<ServerPlusIcon />
</nuxt-link>
</ButtonStyled>
<ButtonStyled circular size="large">
<ClientOnly>
<button
v-if="auth.user"
@@ -315,14 +306,15 @@
? formatMessage(commonMessages.unfollowButton)
: formatMessage(commonMessages.followButton)
"
type="button"
:aria-label="
following
? formatMessage(commonMessages.unfollowButton)
: formatMessage(commonMessages.followButton)
"
@click="userFollowProject(project)"
@click="followProjectFromHeader"
>
<HeartIcon :fill="following ? 'currentColor' : 'none'" aria-hidden="true" />
<HeartIcon :fill="following ? 'currentColor' : 'none'" />
</button>
<nuxt-link
v-else
@@ -343,156 +335,31 @@
</template>
</ClientOnly>
</ButtonStyled>
<ButtonStyled size="large" circular>
<PopoutMenu
v-if="auth.user"
:tooltip="
collections.some((x) => x.projects.includes(project.id))
? formatMessage(commonMessages.savedLabel)
: formatMessage(commonMessages.saveButton)
"
from="top-right"
:aria-label="formatMessage(commonMessages.saveButton)"
:dropdown-id="`${baseId}-save`"
>
<BookmarkIcon
aria-hidden="true"
:fill="
collections.some((x) => x.projects.includes(project.id))
? 'currentColor'
: 'none'
"
/>
<template #menu>
<StyledInput
v-model="displayCollectionsSearch"
:placeholder="formatMessage(commonMessages.searchPlaceholder)"
wrapper-class="menu-search"
/>
<div v-if="collections.length > 0" class="collections-list text-primary">
<Checkbox
v-for="option in collections
.slice()
.sort((a, b) => a.name.localeCompare(b.name))"
:key="option.id"
:model-value="option.projects.includes(project.id)"
class="popout-checkbox"
@update:model-value="() => onUserCollectProject(option, project.id)"
>
{{ option.name }}
</Checkbox>
</div>
<div v-else class="menu-text">
<p class="popout-text">{{ formatMessage(messages.noCollectionsFound) }}</p>
</div>
<ButtonStyled>
<button
class="mx-3 mb-3"
@click="(event) => $refs.modal_collection.show(event)"
>
<PlusIcon aria-hidden="true" />
{{ formatMessage(messages.createNewCollection) }}
</button>
</ButtonStyled>
</template>
</PopoutMenu>
<nuxt-link v-else v-tooltip="'Save'" :to="signInRouteObj" aria-label="Save">
<BookmarkIcon aria-hidden="true" />
</nuxt-link>
</ButtonStyled>
<ProjectCollectionSaveButton
:auth-user="auth.user"
:sign-in-route="signInRouteObj"
:project-id="project.id"
:collections="collections"
:saved="collections.some((x) => x.projects.includes(project.id))"
:base-id="baseId"
:no-collections-label="formatMessage(messages.noCollectionsFound)"
:create-new-collection-label="formatMessage(messages.createNewCollection)"
:collect-project="onUserCollectProject"
:create-collection="(event) => modalCollection?.show(event)"
/>
<ButtonStyled size="large" circular type="transparent">
<OverflowMenu
<ButtonStyled circular size="large" type="transparent">
<TeleportOverflowMenu
:options="projectHeaderMoreActions"
:tooltip="formatMessage(commonMessages.moreOptionsButton)"
:options="[
{
id: 'analytics',
link: `/${project.project_type}/${project.slug ? project.slug : project.id}/settings/analytics`,
hoverOnly: true,
shown: auth.user && !!currentMember,
},
{
divider: true,
shown: auth.user && !!currentMember,
},
{
id: 'moderation-checklist',
action: openModerationChecklistFromMenu,
color: 'orange',
hoverOnly: true,
shown:
auth.user &&
tags.staffRoles.includes(auth.user.role) &&
!showModerationChecklist,
},
{
id: 'tech-review',
link: `/moderation/technical-review/${project.id}`,
color: 'orange',
hoverOnly: true,
shown: auth.user && tags.staffRoles.includes(auth.user.role),
},
{
id: 'moderation-modpack-rescan',
action: () => scanModal.show(),
color: 'orange',
hoverOnly: true,
shown:
auth.user &&
tags.staffRoles.includes(auth.user.role) &&
project.actualProjectType === 'modpack',
},
{
divider: true,
shown: auth.user && tags.staffRoles.includes(auth.user.role),
},
{
id: 'report',
action: () =>
auth.user
? reportProject(project.id)
: navigateTo(
getSignInRouteObj(route, getReportPath('project', project.id)),
),
color: 'red',
hoverOnly: true,
shown: !isMember,
},
{ id: 'copy-id', action: () => copyId() },
{ id: 'copy-permalink', action: () => copyPermalink() },
]"
:aria-label="formatMessage(commonMessages.moreOptionsButton)"
:dropdown-id="`${baseId}-more-options`"
>
<MoreVerticalIcon aria-hidden="true" />
<template #analytics>
<ChartIcon aria-hidden="true" />
{{ formatMessage(commonMessages.analyticsButton) }}
</template>
<template #moderation-checklist>
<ScaleIcon aria-hidden="true" /> {{ formatMessage(messages.reviewProject) }}
</template>
<template #tech-review> <ScanEyeIcon aria-hidden="true" /> Tech review </template>
<template #moderation-modpack-rescan>
<FolderSearchIcon aria-hidden="true" /> Rescan modpack
</template>
<template #report>
<ReportIcon aria-hidden="true" />
{{ formatMessage(commonMessages.reportButton) }}
</template>
<template #copy-id>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyIdButton) }}
</template>
<template #copy-permalink>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyPermalinkButton) }}
</template>
</OverflowMenu>
<MoreVerticalIcon />
</TeleportOverflowMenu>
</ButtonStyled>
</template>
</ProjectHeader>
</ProjectPageHeader>
<ProjectMemberHeader
v-if="currentMember"
:project="project"
@@ -726,7 +593,6 @@
<script setup>
import {
BookmarkIcon,
BookTextIcon,
CalendarIcon,
ChartIcon,
@@ -739,7 +605,6 @@ import {
ListIcon,
MoreVerticalIcon,
PlayIcon,
PlusIcon,
ReportIcon,
ScaleIcon,
ScanEyeIcon,
@@ -752,7 +617,6 @@ import {
Admonition,
Avatar,
ButtonStyled,
Checkbox,
commonMessages,
defineMessages,
injectModrinthClient,
@@ -761,12 +625,10 @@ import {
NavTabs,
NewModal,
OpenInAppModal,
OverflowMenu,
PopoutMenu,
PROJECT_DEP_MARKER_QUERY,
ProjectBackgroundGradient,
ProjectEnvironmentModal,
ProjectHeader,
ProjectPageHeader,
ProjectSidebarCompatibility,
ProjectSidebarCreators,
ProjectSidebarDetails,
@@ -774,8 +636,7 @@ import {
ProjectSidebarServerInfo,
ProjectSidebarTags,
provideProjectPageContext,
StyledInput,
TagItem,
TeleportOverflowMenu,
useDebugLogger,
useFormatDateTime,
useFormatPrice,
@@ -795,6 +656,7 @@ import MessageBanner from '~/components/ui/MessageBanner.vue'
import ModerationChecklist from '~/components/ui/moderation/checklist/ModerationChecklist.vue'
import ModerationProjectNags from '~/components/ui/moderation/ModerationProjectNags.vue'
import ModpackScanModal from '~/components/ui/moderation/ModpackScanModal.vue'
import ProjectCollectionSaveButton from '~/components/ui/ProjectCollectionSaveButton.vue'
import ProjectDownloadModal from '~/components/ui/ProjectDownloadModal/index.vue'
import ProjectMemberHeader from '~/components/ui/ProjectMemberHeader.vue'
import { getSignInRouteObj } from '~/composables/auth.ts'
@@ -851,11 +713,11 @@ const flags = useFeatureFlags()
const cosmetics = useCosmetics()
const { formatMessage } = useVIntl()
const formatPrice = useFormatPrice()
const formatDateTime = useFormatDateTime({
timeStyle: 'short',
dateStyle: 'long',
})
const formatPrice = useFormatPrice()
const debug = useDebugLogger('DownloadModal')
@@ -925,10 +787,6 @@ const messages = defineMessages({
id: 'project.navigation.changelog',
defaultMessage: 'Changelog',
},
createNewCollection: {
id: 'project.collections.create-new',
defaultMessage: 'Create new collection',
},
createServer: {
id: 'project.actions.create-server',
defaultMessage: 'Create a server',
@@ -937,6 +795,10 @@ const messages = defineMessages({
id: 'project.actions.create-server-tooltip',
defaultMessage: 'Create a server',
},
createNewCollection: {
id: 'project.collections.create-new',
defaultMessage: 'Create new collection',
},
descriptionTab: {
id: 'project.description.title',
defaultMessage: 'Description',
@@ -945,9 +807,9 @@ const messages = defineMessages({
id: 'project.actions.dont-show-again',
defaultMessage: "Don't show again",
},
downloadsStat: {
id: 'project.stats.downloads-label',
defaultMessage: '{count, plural, one {download} other {downloads}}',
editProject: {
id: 'project.actions.edit-project',
defaultMessage: 'Edit project',
},
errorLoadingProject: {
id: 'project.error.loading',
@@ -975,10 +837,6 @@ const messages = defineMessages({
id: 'project.environment.migration.learn-more',
defaultMessage: 'Learn more about this change',
},
followersStat: {
id: 'project.stats.followers-label',
defaultMessage: '{count, plural, one {follower} other {followers}}',
},
galleryTab: {
id: 'project.gallery.title',
defaultMessage: 'Gallery',
@@ -1039,6 +897,10 @@ const messages = defineMessages({
id: 'project.actions.review-project',
defaultMessage: 'Review project',
},
rescanModpack: {
id: 'project.actions.rescan-modpack',
defaultMessage: 'Rescan modpack',
},
serversPromoDescription: {
id: 'project.actions.servers-promo.description',
defaultMessage: 'Modrinth Hosting is the easiest way to play with your friends without hassle!',
@@ -1066,6 +928,7 @@ const messages = defineMessages({
})
const modalLicense = ref(null)
const modalCollection = useTemplateRef('modal_collection')
const licenseText = ref('')
const createdDate = computed(() =>
@@ -1104,13 +967,8 @@ async function getLicenseData(event) {
}
}
const displayCollectionsSearch = ref('')
const collections = computed(() =>
user.value && user.value.collections
? user.value.collections.filter((x) =>
x.name.toLowerCase().includes(displayCollectionsSearch.value.toLowerCase()),
)
: [],
user.value && user.value.collections ? user.value.collections : [],
)
if (
@@ -1844,6 +1702,89 @@ const canCreateServerFrom = computed(() => {
return project.value.project_type === 'modpack' && project.value.server_side !== 'unsupported'
})
const projectSearchUrl = computed(
() => `/discover/${isServerProject.value ? 'servers' : `${project.value?.project_type}s`}`,
)
const projectPath = computed(() =>
project.value
? `/${project.value.project_type}/${project.value.slug ? project.value.slug : project.value.id}`
: '',
)
const projectHeaderPrimaryColor = computed(() =>
currentMember.value || route.name === 'type-project-version-version' ? 'standard' : 'brand',
)
const showProjectHeaderCreateServerAction = computed(
() => canCreateServerFrom.value && flags.value.showProjectPageQuickServerButton,
)
const projectHeaderCreateServerTo = computed(() =>
project.value ? `/hosting?project=${project.value.id}#plan` : '/hosting',
)
const projectHeaderMoreActions = computed(() => {
const isStaff = !!(auth.value.user && tags.value.staffRoles.includes(auth.value.user.role))
return [
{
id: 'analytics',
label: formatMessage(commonMessages.analyticsButton),
icon: ChartIcon,
link: `${projectPath.value}/settings/analytics`,
shown: !!auth.value.user && !!currentMember.value,
},
{
divider: true,
shown: !!auth.value.user && !!currentMember.value,
},
{
id: 'moderation-checklist',
label: formatMessage(messages.reviewProject),
icon: ScaleIcon,
action: openModerationChecklistFromMenu,
color: 'orange',
shown: !!auth.value.user && isStaff && !showModerationChecklist.value,
},
{
id: 'tech-review',
label: 'Tech review',
icon: ScanEyeIcon,
link: `/moderation/technical-review/${project.value?.id}`,
color: 'orange',
shown: !!auth.value.user && isStaff,
},
{
id: 'moderation-modpack-rescan',
label: formatMessage(messages.rescanModpack),
icon: FolderSearchIcon,
action: () => scanModal.value?.show(),
color: 'orange',
shown: !!auth.value.user && isStaff && project.value?.actualProjectType === 'modpack',
},
{
divider: true,
shown: !!auth.value.user && isStaff,
},
{
id: 'report',
label: formatMessage(commonMessages.reportButton),
icon: ReportIcon,
action: reportProjectFromHeader,
color: 'red',
shown: !isMember.value,
},
{
id: 'copy-id',
label: formatMessage(commonMessages.copyIdButton),
icon: ClipboardCopyIcon,
action: copyId,
},
{
id: 'copy-permalink',
label: formatMessage(commonMessages.copyPermalinkButton),
icon: ClipboardCopyIcon,
action: copyPermalink,
},
]
})
const createCanonicalUrl = () =>
project.value ? `https://modrinth.com/project/${project.value.id}` : undefined
@@ -1878,6 +1819,33 @@ if (!route.name.startsWith('type-project-settings')) {
const onUserCollectProject = useClientTry(userCollectProject)
function handleProjectHeaderPrimary(event) {
if (isServerProject.value) {
handlePlayServerProject()
} else {
downloadModal.value?.show(event)
}
}
function dismissProjectHeaderCreateServerPrompt() {
flags.value.showProjectPageCreateServersTooltip = false
saveFeatureFlags()
}
function followProjectFromHeader() {
if (!project.value) return
userFollowProject(project.value)
}
function reportProjectFromHeader() {
if (!project.value) return
if (auth.value.user) {
reportProject(project.value.id)
} else {
navigateTo(getSignInRouteObj(route, getReportPath('project', project.value.id)))
}
}
watch(
[versionsV3, _versionsV3Error],
([data, error]) => {
@@ -128,7 +128,7 @@ const { data: globals } = useQuery<AuthGlobalsResponse>({
},
})
async function completeOAuthSignUp() {
async function completeOAuthSignUp(accountConsent: boolean) {
startLoading()
try {
if (!oauthFlowState.value) {
@@ -140,6 +140,7 @@ async function completeOAuthSignUp() {
state: oauthFlowState.value,
challenge: token.value,
sign_up_newsletter: subscribe.value,
account_consent: accountConsent,
})
await finishSignIn(res.session)
+2 -1
View File
@@ -250,7 +250,7 @@ function isUsernameTakenValidationError(error: unknown): boolean {
return errorCode === 'username_taken'
}
async function createAccount() {
async function createAccount(accountConsent: boolean) {
startLoading()
try {
const res = await client.labrinth.auth_v2.createAccount({
@@ -259,6 +259,7 @@ async function createAccount() {
email: email.value,
challenge: token.value,
sign_up_newsletter: subscribe.value,
account_consent: accountConsent,
})
await useAuth(res.session)
@@ -62,86 +62,16 @@
</template>
<template v-else>
<div class="normal-page__header py-4">
<ContentPageHeader>
<template #icon>
<Avatar :src="organization.icon_url" :alt="organization.name" size="96px" />
</template>
<template #title>
{{ organization.name }}
</template>
<template #title-suffix>
<div class="ml-1 flex items-center gap-2 font-semibold">
<OrganizationIcon />
Organization
</div>
</template>
<template #summary>
{{ organization.description }}
</template>
<template #stats>
<div
class="flex items-center gap-2 border-0 border-r border-solid border-divider pr-4 font-semibold"
>
<UsersIcon class="h-6 w-6 text-secondary" />
{{ formatCompactNumber(acceptedMembers?.length || 0) }}
members
</div>
<div
class="flex items-center gap-2 border-0 border-r border-solid border-divider pr-4 font-semibold"
>
<BoxIcon class="h-6 w-6 text-secondary" />
{{ formatCompactNumber(projects?.length || 0) }}
projects
</div>
<div
v-tooltip="formatNumber(sumDownloads)"
class="flex items-center gap-2 font-semibold"
>
<DownloadIcon class="h-6 w-6 text-secondary" />
{{ formatCompactNumber(sumDownloads) }}
downloads
</div>
</template>
<template #actions>
<ButtonStyled v-if="auth.user && currentMember" size="large">
<NuxtLink :to="`/organization/${organization.slug}/settings`">
<SettingsIcon aria-hidden="true" />
Manage
</NuxtLink>
</ButtonStyled>
<ButtonStyled size="large" circular type="transparent">
<OverflowMenu
:options="[
{
id: 'manage-projects',
action: () =>
router.push('/organization/' + organization?.slug + '/settings/projects'),
hoverFilledOnly: true,
shown: !!(auth.user && currentMember),
},
{ divider: true, shown: !!(auth?.user && currentMember) },
{ id: 'copy-id', action: () => copyId() },
{ id: 'copy-permalink', action: () => copyPermalink() },
]"
aria-label="More options"
>
<MoreVerticalIcon aria-hidden="true" />
<template #manage-projects>
<BoxIcon aria-hidden="true" />
Manage projects
</template>
<template #copy-id>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyIdButton) }}
</template>
<template #copy-permalink>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyPermalinkButton) }}
</template>
</OverflowMenu>
</ButtonStyled>
</template>
</ContentPageHeader>
<OrganizationPageHeader
:organization="organization"
:members-count="acceptedMembers?.length || 0"
:projects-count="projects?.length || 0"
:downloads="sumDownloads"
:can-manage="!!(auth.user && currentMember)"
@manage-projects="router.push(`/organization/${organization.slug}/settings/projects`)"
@copy-id="copyId"
@copy-permalink="copyPermalink"
/>
</div>
<div class="normal-page__sidebar">
<AdPlaceholder v-if="!auth.user" />
@@ -293,11 +223,7 @@ import {
BoxIcon,
ChartIcon,
CheckIcon,
ClipboardCopyIcon,
CrownIcon,
DownloadIcon,
MoreVerticalIcon,
OrganizationIcon,
SettingsIcon,
SpinnerIcon,
UsersIcon,
@@ -307,16 +233,13 @@ import {
Avatar,
ButtonStyled,
commonMessages,
ContentPageHeader,
injectModrinthClient,
NavTabs,
OverflowMenu,
PROJECT_DEP_MARKER_QUERY,
ProjectCard,
ProjectCardList,
SidebarCard,
useCompactNumber,
useFormatNumber,
useVIntl,
} from '@modrinth/ui'
import type { Organization, ProjectStatus, ProjectType } from '@modrinth/utils'
@@ -326,6 +249,7 @@ import UpToDate from '~/assets/images/illustrations/up_to_date.svg?component'
import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
import NavStack from '~/components/ui/NavStack.vue'
import OrganizationPageHeader from '~/components/ui/OrganizationPageHeader.vue'
import { acceptTeamInvite, removeTeamMember } from '~/helpers/teams.js'
import {
OrganizationContext,
@@ -342,7 +266,6 @@ type ProjectV3 = Labrinth.Projects.v3.Project & {
const vintl = useVIntl()
const { formatMessage } = vintl
const formatNumber = useFormatNumber()
const { formatCompactNumber } = useCompactNumber()
const auth: { user: any } & any = await useAuth()
+49 -258
View File
@@ -120,35 +120,34 @@
</NewModal>
<div class="new-page sidebar" :class="{ 'alt-layout': cosmetics.leftContentLayout }">
<div class="normal-page__header py-4">
<ContentPageHeader>
<template #icon>
<Avatar
:src="user.avatar_url"
:alt="user.username"
:size="isModrinthUser ? '64px' : '96px'"
circle
/>
</template>
<template #title>
<span class="flex items-center gap-2">
{{ user.username }}
<BadgeCheckIcon
v-if="isOfficialAccount"
v-tooltip="formatMessage(messages.officialAccount)"
class="size-5 text-brand"
fill="var(--color-brand-highlight)"
/>
<TagItem
v-if="isAdminViewing && isAffiliate"
:style="{
'--_color': 'var(--color-brand)',
'--_bg-color': 'var(--color-brand-highlight)',
}"
>
<AffiliateIcon /> Affiliate
</TagItem>
</span>
</template>
<UserPageHeader
:user="user"
:summary="isModrinthUser ? null : profileHeaderSummary"
:auth-user="auth.user"
:is-modrinth-user="isModrinthUser"
:is-official-account="isOfficialAccount"
:show-affiliate-badge="isAdminViewing && !!isAffiliate"
:is-affiliate="!!isAffiliate"
:is-self="auth.user?.id === user.id"
:is-admin="isAdminViewing"
:is-staff="!!(auth.user && isStaff(auth.user))"
:projects-count="projects?.length || 0"
:downloads="sumDownloads"
@manage-projects="navigateTo('/dashboard/projects')"
@report="reportProfileFromHeader"
@copy-id="copyId"
@copy-permalink="copyPermalink"
@open-billing="navigateTo(`/admin/billing/${user.id}`)"
@toggle-affiliate="toggleAffiliate(user.id)"
@open-info="userDetailsModal?.show()"
@open-analytics="
navigateTo({
path: '/dashboard/analytics',
query: { user: user.username || user.id },
})
"
@edit-role="openRoleEditModal"
>
<template v-if="isModrinthUser" #summary>
<IntlFormatted :message-id="messages.officialAccountBio">
<template #support-link>
@@ -173,159 +172,7 @@
</template>
</IntlFormatted>
</template>
<template v-else #summary>
{{
user.bio
? user.bio
: projects?.length > 0
? formatMessage(messages.bioFallbackCreator)
: formatMessage(messages.bioFallbackUser)
}}
</template>
<template v-if="!isModrinthUser" #stats>
<div
class="flex items-center gap-2 border-0 border-r border-solid border-divider pr-4 font-semibold"
>
<BoxIcon class="h-6 w-6 text-secondary" />
{{
formatMessage(messages.profileProjectsLabel, {
count: formatCompactNumber(projects?.length || 0),
countPlural: formatCompactNumberPlural(projects?.length || 0),
})
}}
</div>
<div
v-tooltip="formatNumber(sumDownloads)"
class="flex items-center gap-2 border-0 border-r border-solid border-divider pr-4 font-semibold"
>
<DownloadIcon class="h-6 w-6 text-secondary" />
{{
formatMessage(messages.profileDownloadsLabel, {
count: formatCompactNumber(sumDownloads),
countPlural: formatCompactNumberPlural(sumDownloads),
})
}}
</div>
<div
v-tooltip="formatDateTime(user.created)"
class="flex items-center gap-2 font-semibold"
>
<CalendarIcon class="h-6 w-6 text-secondary" />
{{ formatMessage(messages.profileJoinedLabel) }}
{{ formatRelativeTime(user.created) }}
</div>
</template>
<template #actions>
<ButtonStyled size="large">
<NuxtLink v-if="auth.user && auth.user.id === user.id" to="/settings/profile">
<EditIcon aria-hidden="true" />
{{ formatMessage(commonMessages.editButton) }}
</NuxtLink>
</ButtonStyled>
<ButtonStyled size="large" circular type="transparent">
<OverflowMenu
:options="[
{
id: 'manage-projects',
action: () => navigateTo('/dashboard/projects'),
hoverOnly: true,
shown: auth.user && auth.user.id === user.id,
},
{ divider: true, shown: auth.user && auth.user.id === user.id },
{
id: 'report',
action: () =>
auth.user ? reportUser(user.id) : navigateTo(getSignInRouteObj(route)),
color: 'red',
hoverOnly: true,
shown: auth.user?.id !== user.id,
},
{ id: 'copy-id', action: () => copyId() },
{ id: 'copy-permalink', action: () => copyPermalink() },
{
divider: true,
shown: auth.user && isAdmin(auth.user),
},
{
id: 'open-billing',
action: () => navigateTo(`/admin/billing/${user.id}`),
shown: auth.user && isStaff(auth.user),
},
{
id: 'toggle-affiliate',
action: () => toggleAffiliate(user.id),
shown: isAdminViewing,
remainOnClick: true,
color: isAffiliate ? 'red' : 'orange',
},
{
id: 'open-info',
action: () => $refs.userDetailsModal.show(),
shown: auth.user && isStaff(auth.user),
},
{
id: 'open-analytics',
action: () =>
navigateTo({
path: '/dashboard/analytics',
query: { user: user.username || user.id },
}),
shown: auth.user && isAdmin(auth.user),
},
{
id: 'edit-role',
action: () => openRoleEditModal(),
shown: auth.user && isAdmin(auth.user),
},
]"
aria-label="More options"
:dropdown-id="`${baseId}-more-options`"
>
<MoreVerticalIcon aria-hidden="true" />
<template #manage-projects>
<BoxIcon aria-hidden="true" />
{{ formatMessage(messages.profileManageProjectsButton) }}
</template>
<template #report>
<ReportIcon aria-hidden="true" />
{{ formatMessage(commonMessages.reportButton) }}
</template>
<template #copy-id>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyIdButton) }}
</template>
<template #copy-permalink>
<ClipboardCopyIcon aria-hidden="true" />
{{ formatMessage(commonMessages.copyPermalinkButton) }}
</template>
<template #open-billing>
<CurrencyIcon aria-hidden="true" />
{{ formatMessage(messages.billingButton) }}
</template>
<template #open-info>
<InfoIcon aria-hidden="true" />
{{ formatMessage(messages.infoButton) }}
</template>
<template #open-analytics>
<ChartIcon aria-hidden="true" />
{{ formatMessage(messages.analyticsButton) }}
</template>
<template #toggle-affiliate>
<AffiliateIcon aria-hidden="true" />
{{
formatMessage(
isAffiliate ? messages.removeAffiliateButton : messages.setAffiliateButton,
)
}}
</template>
<template #edit-role>
<EditIcon aria-hidden="true" />
{{ formatMessage(messages.editRoleButton) }}
</template>
</OverflowMenu>
</ButtonStyled>
</template>
</ContentPageHeader>
</UserPageHeader>
</div>
<div class="normal-page__content">
<div v-if="navLinks.length > 2" class="mb-4 max-w-full overflow-x-auto">
@@ -509,23 +356,12 @@
</template>
<script setup>
import {
AffiliateIcon,
BadgeCheckIcon,
BoxIcon,
CalendarIcon,
ChartIcon,
CheckIcon,
ClipboardCopyIcon,
CurrencyIcon,
DownloadIcon,
EditIcon,
GlobeIcon,
InfoIcon,
LibraryIcon,
LinkIcon,
LockIcon,
MoreVerticalIcon,
ReportIcon,
SaveIcon,
SpinnerIcon,
XIcon,
@@ -535,22 +371,15 @@ import {
ButtonStyled,
Combobox,
commonMessages,
ContentPageHeader,
defineMessages,
injectModrinthClient,
injectNotificationManager,
IntlFormatted,
NavTabs,
NewModal,
OverflowMenu,
ProjectCard,
ProjectCardList,
TagItem,
useCompactNumber,
useFormatDateTime,
useFormatNumber,
UserBadges,
useRelativeTime,
useVIntl,
} from '@modrinth/ui'
import { isAdmin, isStaff, UserBadge } from '@modrinth/utils'
@@ -561,6 +390,7 @@ import UpToDate from '~/assets/images/illustrations/up_to_date.svg?component'
import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
import CollectionCreateModal from '~/components/ui/create/CollectionCreateModal.vue'
import ModalCreation from '~/components/ui/create/ProjectCreateModal.vue'
import UserPageHeader from '~/components/ui/UserPageHeader.vue'
import { getSignInRouteObj } from '~/composables/auth.ts'
import { projectUserSorting } from '~/utils/projects.ts'
import { reportUser } from '~/utils/report-helpers.ts'
@@ -575,35 +405,14 @@ const config = useRuntimeConfig()
const queryClient = useQueryClient()
const { formatMessage } = useVIntl()
const formatNumber = useFormatNumber()
const { formatCompactNumber, formatCompactNumberPlural } = useCompactNumber()
const formatRelativeTime = useRelativeTime()
const formatDateTime = useFormatDateTime({
timeStyle: 'short',
dateStyle: 'long',
})
const { addNotification } = injectNotificationManager()
const baseId = useId()
const messages = defineMessages({
profileProjectsLabel: {
id: 'profile.label.projects',
defaultMessage: '{count} {countPlural, plural, one {project} other {projects}}',
},
profileDownloadsLabel: {
id: 'profile.label.downloads',
defaultMessage: '{count} {countPlural, plural, one {download} other {downloads}}',
},
collectionProjectsCount: {
id: 'profile.collection.projects-count',
defaultMessage: '{count, plural, one {# project} other {# projects}}',
},
profileJoinedLabel: {
id: 'profile.label.joined',
defaultMessage: 'Joined',
},
savingLabel: {
id: 'profile.label.saving',
defaultMessage: 'Saving...',
@@ -669,10 +478,6 @@ const messages = defineMessages({
id: 'profile.label.badges',
defaultMessage: 'Badges',
},
profileManageProjectsButton: {
id: 'profile.button.manage-projects',
defaultMessage: 'Manage projects',
},
profileMetaDescription: {
id: 'profile.meta.description',
defaultMessage: "Download {username}'s projects on Modrinth",
@@ -699,42 +504,10 @@ const messages = defineMessages({
defaultMessage:
"You don't have any collections.\nWould you like to <create-link>create one</create-link>?",
},
billingButton: {
id: 'profile.button.billing',
defaultMessage: 'Manage user billing',
},
infoButton: {
id: 'profile.button.info',
defaultMessage: 'View user details',
},
analyticsButton: {
id: 'profile.button.analytics',
defaultMessage: 'View user analytics',
},
setAffiliateButton: {
id: 'profile.button.set-affiliate',
defaultMessage: 'Set as affiliate',
},
removeAffiliateButton: {
id: 'profile.button.remove-affiliate',
defaultMessage: 'Remove as affiliate',
},
affiliateLabel: {
id: 'profile.label.affiliate',
defaultMessage: 'Affiliate',
},
editRoleButton: {
id: 'profile.button.edit-role',
defaultMessage: 'Edit role',
},
userNotFoundError: {
id: 'profile.error.not-found',
defaultMessage: 'User not found',
},
officialAccount: {
id: 'profile.official-account',
defaultMessage: 'Official Modrinth account',
},
officialAccountBio: {
id: 'profile.official-account.bio',
defaultMessage:
@@ -891,14 +664,32 @@ async function copyPermalink() {
await navigator.clipboard.writeText(`${config.public.siteUrl}/user/${user.value.id}`)
}
function reportProfileFromHeader() {
if (!user.value) return
if (auth.value.user) {
reportUser(user.value.id)
} else {
navigateTo(getSignInRouteObj(route))
}
}
const isAffiliate = computed(() => user.value?.badges & UserBadge.AFFILIATE)
const isAdminViewing = computed(() => isAdmin(auth.value.user))
const userDetailsModal = useTemplateRef('userDetailsModal')
async function toggleAffiliate(id) {
await client.labrinth.users_v2.patch(id, { badges: user.value.badges ^ (1 << 7) })
queryClient.invalidateQueries({ queryKey: ['user', userId] })
}
const profileHeaderSummary = computed(() =>
user.value?.bio
? user.value.bio
: (projects.value?.length ?? 0) === 0
? formatMessage(messages.bioFallbackUser)
: formatMessage(messages.bioFallbackCreator),
)
const navLinks = computed(() => [
{
label: formatMessage(commonMessages.allProjectType),
@@ -950,7 +741,7 @@ function saveRoleEdit() {
editRoleModal.value?.hide()
})
.catch(() => {
.catch((error) => {
console.error('Failed to update user role:', error)
addNotification({
+3
View File
@@ -73,13 +73,16 @@ image = { workspace = true, features = [
itertools = { workspace = true }
json-patch = { workspace = true }
lettre = { workspace = true }
lz4_flex = { workspace = true }
meilisearch-sdk = { workspace = true, features = ["reqwest"] }
modrinth-content-management = { workspace = true }
modrinth-util = { workspace = true, features = ["decimal", "sentry", "utoipa"] }
muralpay = { workspace = true, features = ["client", "mock", "utoipa"] }
murmur2 = { workspace = true }
neverbounce = { workspace = true }
paste = { workspace = true }
path-util = { workspace = true }
postcard = { workspace = true }
prometheus = { workspace = true }
quick-xml = { workspace = true }
rand = { workspace = true }
+10
View File
@@ -15,6 +15,16 @@ use crate::routes::ApiError;
use futures::TryStreamExt;
use itertools::Itertools;
pub fn require_verified_email(user: &User) -> Result<(), ApiError> {
if !user.email_verified.unwrap_or(false) {
return Err(ApiError::Auth(eyre::eyre!(
"Please verify your email before publishing!"
)));
}
Ok(())
}
pub trait ValidateAuthorized {
fn validate_authorized(
&self,
+1 -1
View File
@@ -5,7 +5,7 @@ pub mod validate;
pub use checks::{
filter_enlisted_projects_ids, filter_enlisted_version_ids,
filter_visible_collections, filter_visible_project_ids,
filter_visible_projects,
filter_visible_projects, require_verified_email,
};
use serde::{Deserialize, Serialize};
pub use validate::{
@@ -11,7 +11,7 @@ use crate::{
};
use serde::{Deserialize, Serialize};
const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events";
const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v1";
const ANALYTICS_EVENTS_ALL_KEY: &str = "all";
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -88,7 +88,7 @@ impl DBAnalyticsEvent {
let mut redis = redis.connect().await?;
if let Some(events) = redis
.get_deserialized_from_json(
.get_deserialized(
ANALYTICS_EVENTS_NAMESPACE,
ANALYTICS_EVENTS_ALL_KEY,
)
@@ -119,7 +119,7 @@ impl DBAnalyticsEvent {
.await?;
redis
.set_serialized_to_json(
.set_serialized(
ANALYTICS_EVENTS_NAMESPACE,
ANALYTICS_EVENTS_ALL_KEY,
&events,
+10 -26
View File
@@ -7,7 +7,7 @@ use super::ids::*;
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
const TAGS_NAMESPACE: &str = "tags";
const TAGS_NAMESPACE: &str = "tags:v1";
pub struct ProjectType {
pub id: ProjectTypeId,
@@ -96,9 +96,8 @@ impl Category {
{
let mut redis = redis.connect().await?;
let res: Option<Vec<Category>> = redis
.get_deserialized_from_json(TAGS_NAMESPACE, "category")
.await?;
let res: Option<Vec<Category>> =
redis.get_deserialized(TAGS_NAMESPACE, "category").await?;
if let Some(res) = res {
return Ok(res);
@@ -127,7 +126,7 @@ impl Category {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(TAGS_NAMESPACE, "category", &result, None)
.set_serialized(TAGS_NAMESPACE, "category", &result, None)
.await?;
Ok(result)
@@ -166,7 +165,7 @@ impl LinkPlatform {
let mut redis = redis.connect().await?;
let res: Option<Vec<LinkPlatform>> = redis
.get_deserialized_from_json(TAGS_NAMESPACE, "link_platform")
.get_deserialized(TAGS_NAMESPACE, "link_platform")
.await?;
if let Some(res) = res {
@@ -191,12 +190,7 @@ impl LinkPlatform {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
TAGS_NAMESPACE,
"link_platform",
&result,
None,
)
.set_serialized(TAGS_NAMESPACE, "link_platform", &result, None)
.await?;
Ok(result)
@@ -235,7 +229,7 @@ impl ReportType {
let mut redis = redis.connect().await?;
let res: Option<Vec<String>> = redis
.get_deserialized_from_json(TAGS_NAMESPACE, "report_type")
.get_deserialized(TAGS_NAMESPACE, "report_type")
.await?;
if let Some(res) = res {
@@ -256,12 +250,7 @@ impl ReportType {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
TAGS_NAMESPACE,
"report_type",
&result,
None,
)
.set_serialized(TAGS_NAMESPACE, "report_type", &result, None)
.await?;
Ok(result)
@@ -300,7 +289,7 @@ impl ProjectType {
let mut redis = redis.connect().await?;
let res: Option<Vec<String>> = redis
.get_deserialized_from_json(TAGS_NAMESPACE, "project_type")
.get_deserialized(TAGS_NAMESPACE, "project_type")
.await?;
if let Some(res) = res {
@@ -321,12 +310,7 @@ impl ProjectType {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
TAGS_NAMESPACE,
"project_type",
&result,
None,
)
.set_serialized(TAGS_NAMESPACE, "project_type", &result, None)
.await?;
Ok(result)
@@ -8,7 +8,7 @@ use dashmap::DashMap;
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
const COLLECTIONS_NAMESPACE: &str = "collections";
const COLLECTIONS_NAMESPACE: &str = "collections:v1";
#[derive(Clone)]
pub struct CollectionBuilder {
@@ -13,10 +13,9 @@ use serde::{Deserialize, Serialize};
use url::Url;
use webauthn_rs::prelude::{DiscoverableAuthentication, PasskeyRegistration};
const FLOWS_NAMESPACE: &str = "flows";
const FLOWS_NAMESPACE: &str = "flows:v1";
#[derive(Deserialize, Serialize)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum DBFlow {
OAuth {
user_id: Option<DBUserId>,
@@ -78,7 +77,7 @@ impl DBFlow {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
FLOWS_NAMESPACE,
&state,
&self,
@@ -109,7 +108,7 @@ impl DBFlow {
) -> Result<Option<DBFlow>, DatabaseError> {
let mut redis = redis.connect().await?;
redis.get_deserialized_from_json(FLOWS_NAMESPACE, id).await
redis.get_deserialized(FLOWS_NAMESPACE, id).await
}
/// Gets the flow and removes it from the cache, but only removes if the flow was present and the predicate returned true
@@ -6,7 +6,7 @@ use chrono::{DateTime, Utc};
use dashmap::DashMap;
use serde::{Deserialize, Serialize};
const IMAGES_NAMESPACE: &str = "images";
const IMAGES_NAMESPACE: &str = "images:v1";
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct DBImage {
@@ -12,13 +12,14 @@ use futures::TryStreamExt;
use itertools::Itertools;
use serde::{Deserialize, Serialize};
const GAMES_LIST_NAMESPACE: &str = "games";
const LOADER_ID: &str = "loader_id";
const LOADERS_LIST_NAMESPACE: &str = "loaders";
const LOADER_FIELDS_NAMESPACE: &str = "loader_fields";
const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all";
const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums";
pub const LOADER_FIELD_ENUM_VALUES_NAMESPACE: &str = "loader_field_enum_values";
const GAMES_LIST_NAMESPACE: &str = "games:v1";
const LOADER_ID: &str = "loader_id:v1";
const LOADERS_LIST_NAMESPACE: &str = "loaders:v1";
const LOADER_FIELDS_NAMESPACE: &str = "loader_fields:v1";
const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all:v1";
const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums:v1";
pub const LOADER_FIELD_ENUM_VALUES_NAMESPACE: &str =
"loader_field_enum_values:v1";
#[derive(Clone, Serialize, Deserialize, Debug)]
pub struct Game {
@@ -54,7 +55,7 @@ impl Game {
{
let mut redis = redis.connect().await?;
let cached_games: Option<Vec<Game>> = redis
.get_deserialized_from_json(GAMES_LIST_NAMESPACE, "games")
.get_deserialized(GAMES_LIST_NAMESPACE, "games")
.await?;
if let Some(cached_games) = cached_games {
return Ok(cached_games);
@@ -80,12 +81,7 @@ impl Game {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
GAMES_LIST_NAMESPACE,
"games",
&result,
None,
)
.set_serialized(GAMES_LIST_NAMESPACE, "games", &result, None)
.await?;
Ok(result)
@@ -114,7 +110,7 @@ impl Loader {
{
let mut redis = redis.connect().await?;
let cached_id: Option<i32> =
redis.get_deserialized_from_json(LOADER_ID, name).await?;
redis.get_deserialized(LOADER_ID, name).await?;
if let Some(cached_id) = cached_id {
return Ok(Some(LoaderId(cached_id)));
}
@@ -134,7 +130,7 @@ impl Loader {
if let Some(result) = result {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(LOADER_ID, name, &result.0, None)
.set_serialized(LOADER_ID, name, &result.0, None)
.await?;
}
@@ -151,7 +147,7 @@ impl Loader {
{
let mut redis = redis.connect().await?;
let cached_loaders: Option<Vec<Loader>> = redis
.get_deserialized_from_json(LOADERS_LIST_NAMESPACE, "all")
.get_deserialized(LOADERS_LIST_NAMESPACE, "all")
.await?;
if let Some(cached_loaders) = cached_loaders {
return Ok(cached_loaders);
@@ -193,12 +189,7 @@ impl Loader {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
LOADERS_LIST_NAMESPACE,
"all",
&result,
None,
)
.set_serialized(LOADERS_LIST_NAMESPACE, "all", &result, None)
.await?;
Ok(result)
@@ -470,10 +461,9 @@ impl LoaderField {
{
let mut redis = redis.connect().await?;
let cached_fields: Option<Vec<LoaderField>> =
redis.get(LOADER_FIELDS_NAMESPACE_ALL, "").await?.and_then(
|x| serde_json::from_str::<Vec<LoaderField>>(&x).ok(),
);
let cached_fields: Option<Vec<LoaderField>> = redis
.get_deserialized(LOADER_FIELDS_NAMESPACE_ALL, "")
.await?;
if let Some(cached_fields) = cached_fields {
return Ok(cached_fields);
@@ -506,12 +496,7 @@ impl LoaderField {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
LOADER_FIELDS_NAMESPACE_ALL,
"",
&result,
None,
)
.set_serialized(LOADER_FIELDS_NAMESPACE_ALL, "", &result, None)
.await?;
Ok(result)
@@ -530,10 +515,7 @@ impl LoaderFieldEnum {
let mut redis = redis.connect().await?;
let cached_enum = redis
.get_deserialized_from_json(
LOADER_FIELD_ENUMS_ID_NAMESPACE,
enum_name,
)
.get_deserialized(LOADER_FIELD_ENUMS_ID_NAMESPACE, enum_name)
.await?;
if let Some(cached_enum) = cached_enum {
return Ok(cached_enum);
@@ -561,7 +543,7 @@ impl LoaderFieldEnum {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
LOADER_FIELD_ENUMS_ID_NAMESPACE,
enum_name,
&result,
+2
View File
@@ -76,6 +76,8 @@ pub enum DatabaseError {
RedisPool(#[from] deadpool_redis::PoolError),
#[error("Error while serializing with the cache: {0}")]
SerdeCacheError(#[from] serde_json::Error),
#[error("error while encoding or decoding the cache: {0}")]
PostcardCacheError(#[from] postcard::Error),
#[error("Schema error: {0}")]
SchemaError(String),
#[error(
@@ -7,9 +7,9 @@ use crate::database::redis::RedisPool;
use super::{DBOrganizationId, DBUserId, DatabaseError};
const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users";
const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users:v1";
const MODERATION_NOTES_ORGANIZATIONS_NAMESPACE: &str =
"moderation_notes_organizations";
"moderation_notes_organizations:v1";
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct DBModerationNote {
@@ -40,7 +40,7 @@ impl DBModerationNote {
let cached = {
let mut redis = redis.connect().await?;
redis
.get_many_deserialized_from_json::<Self>(
.get_many_deserialized::<Self>(
MODERATION_NOTES_USERS_NAMESPACE,
&ids,
)
@@ -87,7 +87,7 @@ impl DBModerationNote {
if let Some(user_id) = note.user_id {
redis
.set_serialized_to_json(
.set_serialized(
MODERATION_NOTES_USERS_NAMESPACE,
user_id.0,
&note,
@@ -130,7 +130,7 @@ impl DBModerationNote {
let cached = {
let mut redis = redis.connect().await?;
redis
.get_many_deserialized_from_json::<Self>(
.get_many_deserialized::<Self>(
MODERATION_NOTES_ORGANIZATIONS_NAMESPACE,
&ids,
)
@@ -177,7 +177,7 @@ impl DBModerationNote {
if let Some(organization_id) = note.organization_id {
redis
.set_serialized_to_json(
.set_serialized(
MODERATION_NOTES_ORGANIZATIONS_NAMESPACE,
organization_id.0,
&note,
@@ -9,7 +9,7 @@ use chrono::{DateTime, Utc};
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications";
const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications:v1";
pub struct NotificationBuilder {
pub body: NotificationBody,
@@ -435,7 +435,7 @@ impl DBNotification {
let mut redis = redis.connect().await?;
let cached_notifications: Option<Vec<DBNotification>> = redis
.get_deserialized_from_json(
.get_deserialized(
USER_NOTIFICATIONS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -493,7 +493,7 @@ impl DBNotification {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
USER_NOTIFICATIONS_NAMESPACE,
user_id.0,
&db_notifications,
@@ -4,10 +4,11 @@ use crate::models::v3::notifications::{NotificationChannel, NotificationType};
use crate::routes::ApiError;
use serde::{Deserialize, Serialize};
const TEMPLATES_NAMESPACE: &str = "notifications_templates";
const TEMPLATES_HTML_DATA_NAMESPACE: &str = "notifications_templates_html_data";
const TEMPLATES_NAMESPACE: &str = "notifications_templates:v1";
const TEMPLATES_HTML_DATA_NAMESPACE: &str =
"notifications_templates_html_data:v1";
const TEMPLATES_DYNAMIC_HTML_NAMESPACE: &str =
"notifications_templates_dynamic_html";
"notifications_templates_dynamic_html:v1";
const HTML_DATA_CACHE_EXPIRY: i64 = 60 * 15; // 15 minutes
const TEMPLATES_CACHE_EXPIRY: i64 = 60 * 30; // 30 minutes
@@ -56,10 +57,7 @@ impl NotificationTemplate {
let mut redis = redis.connect().await?;
let maybe_cached_templates = redis
.get_deserialized_from_json(
TEMPLATES_NAMESPACE,
channel.as_str(),
)
.get_deserialized(TEMPLATES_NAMESPACE, channel.as_str())
.await?;
if let Some(cached) = maybe_cached_templates {
@@ -82,7 +80,7 @@ impl NotificationTemplate {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
TEMPLATES_NAMESPACE,
channel.as_str(),
&templates,
@@ -99,7 +97,7 @@ impl NotificationTemplate {
) -> Result<Option<String>, DatabaseError> {
let mut redis = redis.connect().await?;
redis
.get_deserialized_from_json(
.get_deserialized(
TEMPLATES_HTML_DATA_NAMESPACE,
&self.id.to_string(),
)
@@ -113,7 +111,7 @@ impl NotificationTemplate {
) -> Result<(), DatabaseError> {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
TEMPLATES_HTML_DATA_NAMESPACE,
&self.id.to_string(),
&data,
@@ -138,10 +136,7 @@ where
let mut redis_conn = redis.connect().await?;
if let Some(body) = redis_conn
.get_deserialized_from_json::<HtmlBody>(
TEMPLATES_DYNAMIC_HTML_NAMESPACE,
key,
)
.get_deserialized::<HtmlBody>(TEMPLATES_DYNAMIC_HTML_NAMESPACE, key)
.await?
{
return Ok(body.html);
@@ -153,7 +148,7 @@ where
let mut redis_conn = redis.connect().await?;
redis_conn
.set_serialized_to_json(
.set_serialized(
TEMPLATES_DYNAMIC_HTML_NAMESPACE,
key,
&cached,
@@ -3,7 +3,7 @@ use crate::database::redis::RedisPool;
use crate::models::v3::notifications::NotificationType;
use serde::{Deserialize, Serialize};
const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types";
const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types:v1";
#[derive(Serialize, Deserialize)]
pub struct NotificationTypeItem {
@@ -43,7 +43,7 @@ impl NotificationTypeItem {
let mut redis = redis.connect().await?;
let cached_types = redis
.get_deserialized_from_json(NOTIFICATION_TYPES_NAMESPACE, "all")
.get_deserialized(NOTIFICATION_TYPES_NAMESPACE, "all")
.await?;
if let Some(types) = cached_types {
@@ -63,12 +63,7 @@ impl NotificationTypeItem {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
NOTIFICATION_TYPES_NAMESPACE,
"all",
&types,
None,
)
.set_serialized(NOTIFICATION_TYPES_NAMESPACE, "all", &types, None)
.await?;
Ok(types)
@@ -9,8 +9,8 @@ use std::hash::Hash;
use super::{DBTeamMember, ids::*};
use serde::{Deserialize, Serialize};
const ORGANIZATIONS_NAMESPACE: &str = "organizations";
const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles";
const ORGANIZATIONS_NAMESPACE: &str = "organizations:v1";
const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
/// An organization of users who together control one or more projects and organizations.
+5 -10
View File
@@ -11,9 +11,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
const PATS_NAMESPACE: &str = "pats";
const PATS_TOKENS_NAMESPACE: &str = "pats_tokens";
const PATS_USERS_NAMESPACE: &str = "pats_users";
const PATS_NAMESPACE: &str = "pats:v1";
const PATS_TOKENS_NAMESPACE: &str = "pats_tokens:v1";
const PATS_USERS_NAMESPACE: &str = "pats_users:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct DBPersonalAccessToken {
@@ -161,7 +161,7 @@ impl DBPersonalAccessToken {
let mut redis = redis.connect().await?;
let res = redis
.get_deserialized_from_json::<Vec<i64>>(
.get_deserialized::<Vec<i64>>(
PATS_USERS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -189,12 +189,7 @@ impl DBPersonalAccessToken {
let mut redis = redis.connect().await?;
redis
.set(
PATS_USERS_NAMESPACE,
&user_id.0.to_string(),
&serde_json::to_string(&db_pats)?,
None,
)
.set_serialized(PATS_USERS_NAMESPACE, user_id.0, &db_pats, None)
.await?;
Ok(db_pats)
}
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
use std::convert::TryFrom;
use std::convert::TryInto;
const PRODUCTS_NAMESPACE: &str = "products";
const PRODUCTS_NAMESPACE: &str = "products:v1";
pub struct DBProduct {
pub id: DBProductId,
@@ -153,9 +153,8 @@ impl QueryProductWithPrices {
{
let mut redis = redis.connect().await?;
let res: Option<Vec<QueryProductWithPrices>> = redis
.get_deserialized_from_json(PRODUCTS_NAMESPACE, "all")
.await?;
let res: Option<Vec<QueryProductWithPrices>> =
redis.get_deserialized(PRODUCTS_NAMESPACE, "all").await?;
if let Some(res) = res {
return Ok(res);
@@ -196,7 +195,7 @@ impl QueryProductWithPrices {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(PRODUCTS_NAMESPACE, "all", &products, None)
.set_serialized(PRODUCTS_NAMESPACE, "all", &products, None)
.await?;
Ok(products)
@@ -23,9 +23,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
pub const PROJECTS_NAMESPACE: &str = "projects";
pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs";
const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies";
pub const PROJECTS_NAMESPACE: &str = "projects:v1";
pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs:v1";
const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies:v1";
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct LinkUrl {
@@ -976,7 +976,7 @@ impl DBProject {
let mut redis = redis.connect().await?;
let dependencies = redis
.get_deserialized_from_json::<Dependencies>(
.get_deserialized::<Dependencies>(
PROJECTS_DEPENDENCIES_NAMESPACE,
&id.0.to_string(),
)
@@ -1014,7 +1014,7 @@ impl DBProject {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
PROJECTS_DEPENDENCIES_NAMESPACE,
id.0,
&dependencies,
@@ -10,9 +10,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
const SESSIONS_NAMESPACE: &str = "sessions";
const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids";
const SESSIONS_USERS_NAMESPACE: &str = "sessions_users";
const SESSIONS_NAMESPACE: &str = "sessions:v1";
const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids:v1";
const SESSIONS_USERS_NAMESPACE: &str = "sessions_users:v1";
pub struct SessionBuilder {
pub session: String,
@@ -226,7 +226,7 @@ impl DBSession {
let mut redis = redis.connect().await?;
let res = redis
.get_deserialized_from_json::<Vec<i64>>(
.get_deserialized::<Vec<i64>>(
SESSIONS_USERS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -255,7 +255,7 @@ impl DBSession {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
SESSIONS_USERS_NAMESPACE,
user_id.0,
&db_sessions,
@@ -9,7 +9,7 @@ use itertools::Itertools;
use rust_decimal::Decimal;
use serde::{Deserialize, Serialize};
const TEAMS_NAMESPACE: &str = "teams";
const TEAMS_NAMESPACE: &str = "teams:v1";
pub struct TeamBuilder {
pub members: Vec<TeamMemberBuilder>,
@@ -16,9 +16,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
const USERS_NAMESPACE: &str = "users";
const USER_USERNAMES_NAMESPACE: &str = "users_usernames";
const USERS_PROJECTS_NAMESPACE: &str = "users_projects";
const USERS_NAMESPACE: &str = "users:v1";
const USER_USERNAMES_NAMESPACE: &str = "users_usernames:v1";
const USERS_PROJECTS_NAMESPACE: &str = "users_projects:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct DBUser {
@@ -391,7 +391,7 @@ impl DBUser {
let mut redis = redis.connect().await?;
let cached_projects = redis
.get_deserialized_from_json::<Vec<DBProjectId>>(
.get_deserialized::<Vec<DBProjectId>>(
USERS_PROJECTS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -419,7 +419,7 @@ impl DBUser {
let mut redis = redis.connect().await?;
redis
.set_serialized_to_json(
.set_serialized(
USERS_PROJECTS_NAMESPACE,
user_id.0,
&db_projects,
@@ -22,8 +22,8 @@ use std::collections::HashMap;
use std::iter;
use tracing::error;
pub const VERSIONS_NAMESPACE: &str = "versions";
const VERSION_FILES_NAMESPACE: &str = "versions_files";
pub const VERSIONS_NAMESPACE: &str = "versions:v1";
const VERSION_FILES_NAMESPACE: &str = "versions_files:v1";
pub async fn cleanup_unused_attribution_files_and_groups(
transaction: &mut PgTransaction<'_>,
+145 -37
View File
@@ -12,12 +12,15 @@ use prometheus::{IntGauge, Registry};
use redis::ToRedisArgs;
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
use std::borrow::Cow;
use std::collections::HashMap;
use std::fmt::{Debug, Display};
use std::future::Future;
use std::hash::Hash;
use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
use thiserror::Error;
use tracing::{Instrument, info, info_span};
use util::{cmd, redis_pipe};
@@ -41,8 +44,112 @@ const MGET_CHUNK_SIZE: usize = 32;
// BytesMut peak capacity that builds up under steady load.
const REDIS_MAX_CONN_AGE: Duration = Duration::from_secs(120);
#[repr(u8)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Codec {
Raw = 0,
Lz4 = 1,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum EncodingFormat {
Json,
Postcard,
}
#[derive(Debug, Error)]
#[error("invalid redis codec")]
pub struct InvalidCodec;
#[derive(Debug, Error)]
#[error("invalid redis encoding format")]
pub struct InvalidEncodingFormat;
impl TryFrom<u8> for Codec {
type Error = InvalidCodec;
fn try_from(value: u8) -> Result<Self, Self::Error> {
match value {
0 => Ok(Self::Raw),
1 => Ok(Self::Lz4),
_ => Err(InvalidCodec),
}
}
}
impl FromStr for Codec {
type Err = InvalidCodec;
fn from_str(value: &str) -> Result<Self, Self::Err> {
match value {
"lz4" => Ok(Self::Lz4),
_ => Err(InvalidCodec),
}
}
}
impl FromStr for EncodingFormat {
type Err = InvalidEncodingFormat;
fn from_str(value: &str) -> Result<Self, Self::Err> {
match value {
"json" => Ok(Self::Json),
"postcard" => Ok(Self::Postcard),
_ => Err(InvalidEncodingFormat),
}
}
}
fn encode_value<T: Serialize>(value: &T) -> Result<Vec<u8>, DatabaseError> {
let mut value = match ENV.REDIS_ENCODING_FORMAT {
EncodingFormat::Json => serde_json::to_vec(value)?,
EncodingFormat::Postcard => postcard::to_allocvec(value)?,
};
if ENV.REDIS_COMPRESSION_LEVEL > 0
&& ENV.REDIS_COMPRESSION_ALGORITHM == Codec::Lz4
&& value.len() >= ENV.REDIS_COMPRESSION_THRESHOLD_BYTES
{
let compressed = lz4_flex::block::compress_prepend_size(&value);
let savings_ratio = value.len().saturating_sub(compressed.len()) as f64
/ value.len().max(1) as f64
* 100.0;
if savings_ratio >= ENV.REDIS_COMPRESSION_MIN_SAVINGS_RATIO {
let mut encoded = Vec::with_capacity(compressed.len() + 1);
encoded.push(Codec::Lz4 as u8);
encoded.extend(compressed);
return Ok(encoded);
}
}
let mut encoded = Vec::with_capacity(value.len() + 1);
encoded.push(Codec::Raw as u8);
encoded.append(&mut value);
Ok(encoded)
}
fn decode_value<T>(value: &[u8]) -> Option<T>
where
T: for<'a> Deserialize<'a>,
{
let (codec, value) = value.split_first()?;
let value = match Codec::try_from(*codec).ok()? {
Codec::Raw => Cow::Borrowed(value),
Codec::Lz4 => {
Cow::Owned(lz4_flex::block::decompress_size_prepended(value).ok()?)
}
};
match ENV.REDIS_ENCODING_FORMAT {
EncodingFormat::Json => serde_json::from_slice(&value).ok(),
EncodingFormat::Postcard => postcard::from_bytes(&value).ok(),
}
}
fn cache_expiries(namespace: &str) -> (i64, i64) {
match namespace {
// Namespaces may embed a version suffix like `:v1`, so split it out.
match namespace.split_once(':').map(|t| t.0).unwrap_or(namespace) {
"versions" | "versions_files" => {
(VERSION_DEFAULT_EXPIRY, VERSION_ACTUAL_EXPIRY)
}
@@ -367,12 +474,11 @@ impl RedisPool {
for chunk in args.chunks(MGET_CHUNK_SIZE) {
let part = cmd("MGET")
.arg(chunk)
.query_async::<Vec<Option<String>>>(&mut connection)
.query_async::<Vec<Option<Vec<u8>>>>(&mut connection)
.await?;
cached_values.extend(part.into_iter().filter_map(|x| {
x.and_then(|val| {
serde_json::from_str::<RedisValue<T, K, S>>(&val)
.ok()
decode_value::<RedisValue<T, K, S>>(&val)
})
.map(|val| (val.key.clone(), val))
}));
@@ -492,7 +598,7 @@ impl RedisPool {
"{}_{namespace}:{key}",
self.meta_namespace
),
serde_json::to_string(&value)?,
encode_value(&value)?,
default_expiry as u64,
);
pipe_cmds += 1;
@@ -624,30 +730,27 @@ impl<'a> Drop for LockSentinel<'a> {
impl RedisConnection {
#[tracing::instrument(skip(self))]
pub async fn set(
pub async fn set<D>(
&mut self,
namespace: &str,
id: &str,
data: &str,
data: D,
expiry: Option<i64>,
) -> Result<(), DatabaseError> {
) -> Result<(), DatabaseError>
where
D: ToRedisArgs + Send + Sync + Debug,
{
let mut cmd = cmd("SET");
redis_args(
&mut cmd,
vec![
format!("{}_{}:{}", self.meta_namespace, namespace, id),
data.to_string(),
"EX".to_string(),
expiry.unwrap_or(DEFAULT_EXPIRY).to_string(),
]
.as_slice(),
);
cmd.arg(format!("{}_{}:{}", self.meta_namespace, namespace, id))
.arg(data)
.arg("EX")
.arg(expiry.unwrap_or(DEFAULT_EXPIRY));
redis_execute::<()>(&mut cmd, &mut self.connection).await?;
Ok(())
}
#[tracing::instrument(skip(self, id, data))]
pub async fn set_serialized_to_json<Id, D>(
pub async fn set_serialized<Id, D>(
&mut self,
namespace: &str,
id: Id,
@@ -658,13 +761,8 @@ impl RedisConnection {
Id: Display,
D: serde::Serialize,
{
self.set(
namespace,
&id.to_string(),
&serde_json::to_string(&data)?,
expiry,
)
.await
self.set(namespace, &id.to_string(), encode_value(&data)?, expiry)
.await
}
#[tracing::instrument(skip(self))]
@@ -688,7 +786,7 @@ impl RedisConnection {
&mut self,
namespace: &str,
ids: &[String],
) -> Result<Vec<Option<String>>, DatabaseError> {
) -> Result<Vec<Option<Vec<u8>>>, DatabaseError> {
let mut cmd = cmd("MGET");
redis_args(
&mut cmd,
@@ -702,7 +800,7 @@ impl RedisConnection {
}
#[tracing::instrument(skip(self))]
pub async fn get_deserialized_from_json<R>(
pub async fn get_deserialized<R>(
&mut self,
namespace: &str,
id: &str,
@@ -710,14 +808,19 @@ impl RedisConnection {
where
R: for<'a> serde::Deserialize<'a>,
{
Ok(self
.get(namespace, id)
.await?
.and_then(|x| serde_json::from_str(&x).ok()))
let mut cmd = cmd("GET");
redis_args(
&mut cmd,
vec![format!("{}_{}:{}", self.meta_namespace, namespace, id)]
.as_slice(),
);
let value: Option<Vec<u8>> =
redis_execute(&mut cmd, &mut self.connection).await?;
Ok(value.and_then(|value| decode_value(&value)))
}
#[tracing::instrument(skip(self))]
pub async fn get_many_deserialized_from_json<R>(
pub async fn get_many_deserialized<R>(
&mut self,
namespace: &str,
ids: &[String],
@@ -729,8 +832,8 @@ impl RedisConnection {
.get_many(namespace, ids)
.await?
.into_iter()
.map(|x| x.and_then(|val| serde_json::from_str::<R>(&val).ok()))
.collect::<Vec<_>>())
.map(|value| value.and_then(|value| decode_value::<R>(&value)))
.collect())
}
#[tracing::instrument(skip(self, id))]
@@ -799,7 +902,7 @@ impl RedisConnection {
namespace: &str,
key: &str,
timeout: Option<f64>,
) -> Result<Option<[String; 2]>, DatabaseError> {
) -> Result<Option<[Vec<u8>; 2]>, DatabaseError> {
let key = format!("{}_{namespace}:{key}", self.meta_namespace);
// a timeout of 0 is infinite
let timeout = timeout.unwrap_or(0.0);
@@ -829,12 +932,17 @@ impl RedisConnection {
#[derive(Serialize, Deserialize)]
pub struct RedisValue<T, K, S> {
key: K,
#[serde(skip_serializing_if = "Option::is_none")]
alias: Option<S>,
iat: i64,
val: T,
}
impl<T, K, S> RedisValue<T, K, S> {
pub fn value(&self) -> &T {
&self.val
}
}
pub fn redis_args(cmd: &mut util::InstrumentedCmd, args: &[String]) {
for arg in args {
cmd.arg(arg);
+10
View File
@@ -235,6 +235,11 @@ vars! {
SENDY_LIST_ID: String = "none";
SENDY_API_KEY: String = "none";
NEVERBOUNCE_API_KEY: String = "";
NEVERBOUNCE_BASE_URL: String = neverbounce::DEFAULT_API_URL;
EMAIL_DOMAIN_BLACKLIST: StringCsv = StringCsv(vec![]);
CLICKHOUSE_REPLICATED: bool = false;
CLICKHOUSE_URL: String = "http://localhost:8123";
CLICKHOUSE_USER: String = "default";
@@ -289,6 +294,11 @@ vars! {
REDIS_WAIT_TIMEOUT_MS: u64 = 15000u64;
REDIS_MAX_CONNECTIONS: u32 = 10000u32;
REDIS_MIN_CONNECTIONS: usize = 0usize;
REDIS_ENCODING_FORMAT: crate::database::redis::EncodingFormat = crate::database::redis::EncodingFormat::Json;
REDIS_COMPRESSION_LEVEL: i32 = 0i32;
REDIS_COMPRESSION_ALGORITHM: crate::database::redis::Codec = crate::database::redis::Codec::Lz4;
REDIS_COMPRESSION_THRESHOLD_BYTES: usize = 1024usize;
REDIS_COMPRESSION_MIN_SAVINGS_RATIO: f64 = 12.5f64;
SEARCH_OPERATION_TIMEOUT: u64 = 300000u64;
+2 -9
View File
@@ -15,10 +15,7 @@ use labrinth::search;
use labrinth::util::anrok;
use labrinth::util::gotenberg::GotenbergClient;
use labrinth::util::ratelimit::rate_limit_middleware;
use labrinth::{app_data_config, app_fallback_config, env};
use labrinth::{
app_routes_config_internal, app_routes_config_v2, app_routes_config_v3,
};
use labrinth::{app_data_config, app_fallback_config, app_routes_config, env};
use labrinth::{clickhouse, database, file_hosting};
use scalar_api_reference::actix_web::config as scalar_config;
use serde_json::json;
@@ -275,11 +272,7 @@ async fn app() -> std::io::Result<()> {
// own - See `sentry::SentryErrorReporting` for why.
.wrap(labrinth::util::sentry::SentryErrorReporting)
.configure(|cfg| app_data_config(cfg, labrinth_config.clone()))
.configure(|cfg| app_routes_config_v2(cfg, labrinth_config.clone()))
.configure(|cfg| app_routes_config_v3(cfg, labrinth_config.clone()))
.configure(|cfg| {
app_routes_config_internal(cfg, labrinth_config.clone())
});
.configure(|cfg| app_routes_config(cfg, labrinth_config.clone()));
let scalar_configuration = json!({
"sources": [
+2 -2
View File
@@ -258,7 +258,7 @@ pub async fn fetch_query_context(
HashMap::new()
} else {
redis
.get_many_deserialized_from_json::<minecraft::JavaServerPing>(
.get_many_deserialized::<minecraft::JavaServerPing>(
server_ping::REDIS_NAMESPACE,
&minecraft_java_server_pings
.iter()
@@ -281,7 +281,7 @@ pub async fn fetch_query_context(
HashMap::new()
} else {
redis
.get_many_deserialized_from_json::<MinecraftServerAnalytics>(
.get_many_deserialized::<MinecraftServerAnalytics>(
MINECRAFT_SERVER_ANALYTICS,
&minecraft_server_analytics
.iter()
+2 -2
View File
@@ -13,7 +13,7 @@ use crate::{
util::error::Context,
};
pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics";
pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics:v1";
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct MinecraftServerAnalytics {
@@ -117,7 +117,7 @@ pub async fn cache_analytics(
debug!("Caching analytics for {project_id}: {analytics:?}");
redis
.set_serialized_to_json(
.set_serialized(
MINECRAFT_SERVER_ANALYTICS,
project_id.to_string(),
analytics,
+3 -3
View File
@@ -13,9 +13,9 @@ use tracing::trace;
pub mod cache;
const DOWNLOADS_NAMESPACE: &str = "downloads";
const VIEWS_NAMESPACE: &str = "views";
const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays";
const DOWNLOADS_NAMESPACE: &str = "downloads:v1";
const VIEWS_NAMESPACE: &str = "views:v1";
const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays:v1";
const MINECRAFT_SERVER_PLAYS_EXPIRY: u64 = 86_400; // 24 hours
const MINECRAFT_SERVER_PLAYS_LIMIT: u32 = 5;
+6 -10
View File
@@ -26,8 +26,9 @@ pub struct ServerPingQueue {
pub incremental_search_queue: IncrementalSearchQueue,
}
pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping";
pub const REDIS_FAILURE_NAMESPACE: &str = "minecraft_java_server_ping_failures";
pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping:v1";
pub const REDIS_FAILURE_NAMESPACE: &str =
"minecraft_java_server_ping_failures:v1";
pub const CLICKHOUSE_TABLE: &str = "minecraft_java_server_pings";
impl ServerPingQueue {
@@ -133,12 +134,7 @@ impl ServerPingQueue {
// ping succeeded; immediately update its online status in redis
redis
.set_serialized_to_json(
REDIS_NAMESPACE,
project_id,
ping,
None,
)
.set_serialized(REDIS_NAMESPACE, project_id, ping, None)
.await
.wrap_err("failed to set redis key")?;
updated_project = true;
@@ -160,7 +156,7 @@ impl ServerPingQueue {
&& count >= ENV.SERVER_PING_MAX_FAIL_COUNT
{
redis
.set_serialized_to_json(
.set_serialized(
REDIS_NAMESPACE,
project_id,
ping,
@@ -254,7 +250,7 @@ impl ServerPingQueue {
.collect::<Vec<_>>();
let all_server_last_pings = redis
.get_many_deserialized_from_json::<exp::minecraft::JavaServerPing>(
.get_many_deserialized::<exp::minecraft::JavaServerPing>(
REDIS_NAMESPACE,
&all_project_ids,
)
@@ -68,7 +68,7 @@ pub struct CampaignInfo {
cached_at: DateTime<Utc>,
}
const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info";
const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info:v1";
const CAMPAIGN_INFO_CACHE_STALE_SECONDS: i64 = 15 * 60;
const CAMPAIGN_INFO_CACHE_TTL_SECONDS: i64 = 24 * 60 * 60;
@@ -326,7 +326,7 @@ pub async fn pride_26(
.wrap_internal_err("connecting to redis")?;
let cached = redis_connection
.get_deserialized_from_json::<CampaignInfo>(
.get_deserialized::<CampaignInfo>(
CAMPAIGN_INFO_CACHE_NAMESPACE,
campaign_id,
)
@@ -382,7 +382,7 @@ pub async fn pride_26(
};
redis_connection
.set_serialized_to_json(
.set_serialized(
CAMPAIGN_INFO_CACHE_NAMESPACE,
campaign_id,
&campaign_info,
@@ -427,7 +427,7 @@ async fn broadcast_notifications(
redis,
RedisFriendsMessage::Notification {
to_user,
notification,
notification_id,
},
)
.await
+99 -25
View File
@@ -24,6 +24,7 @@ use crate::util::captcha::check_hcaptcha;
use crate::util::error::Context;
use crate::util::ext::get_image_ext;
use crate::util::img::upload_image_optimized;
use crate::util::neverbounce::{check_email, email_check_error_generic};
use crate::util::validate::validation_errors_to_string;
use actix_http::header::LOCATION;
use actix_web::http::StatusCode;
@@ -1438,9 +1439,22 @@ struct NewOAuthAccount {
pub state: String,
pub challenge: String,
pub sign_up_newsletter: bool,
#[serde(default)]
pub account_consent: bool,
}
/// Create account with OAuth.
fn validate_account_consent(account_consent: bool) -> Result<(), ApiError> {
if account_consent {
info!("account consent trigger, denying");
return Err(ApiError::Request(eyre!(
"Sorry, something went wrong. Please try again"
)));
}
Ok(())
}
/// Create account with OAuth.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -1463,6 +1477,8 @@ pub async fn create_oauth_account(
ApiError::InvalidInput(validation_errors_to_string(err, None))
})?;
validate_account_consent(new_account.account_consent)?;
if !check_hcaptcha(&req, &new_account.challenge).await? {
return Err(ApiError::Turnstile);
}
@@ -1481,6 +1497,10 @@ pub async fn create_oauth_account(
return Err(ApiError::Internal(eyre!("invalid flow kind")));
};
if let Some(email) = &user.email {
ensure_email_is_usable(email).await?;
}
let mut txn = db
.begin()
.await
@@ -1527,7 +1547,7 @@ struct DiscordCommunityHandoffPayload {
nonce: String,
}
/// Link Discord community.
/// Link Discord community.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -1604,7 +1624,7 @@ pub async fn discord_community_link(
Ok(web::Json(DiscordCommunityLinkResponse { url }))
}
/// Remove an auth provider.
/// Remove an auth provider.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -1709,6 +1729,8 @@ pub struct NewAccount {
pub email: String,
pub challenge: Option<String>,
pub sign_up_newsletter: Option<bool>,
#[serde(default)]
pub account_consent: bool,
}
#[derive(Debug, Validate)]
@@ -1794,6 +1816,52 @@ impl From<NewAccount> for AccountRegisterFlow {
}
}
/// Blacklist entries are matched literally, unless they begin with `*.`, in
/// which case they match any subdomain of the remaining suffix.
fn is_blacklisted_domain(domain: &str) -> bool {
let domain = domain.to_ascii_lowercase();
ENV.EMAIL_DOMAIN_BLACKLIST.iter().any(|entry| {
let entry = entry.trim().to_ascii_lowercase();
match entry.strip_prefix("*.") {
Some(suffix) => domain
.strip_suffix(suffix)
.is_some_and(|subdomain| subdomain.ends_with('.')),
None => entry == domain,
}
})
}
fn ensure_email_domain_is_allowed(email: &str) -> Result<(), ApiError> {
let Some((_, domain)) = email.rsplit_once('@') else {
return Err(ApiError::Request(email_check_error_generic()));
};
if is_blacklisted_domain(domain) {
info!(email.domain = domain, "blacklisted email domain, denying");
return Err(ApiError::Request(email_check_error_generic()));
}
Ok(())
}
async fn ensure_email_is_usable(email: &str) -> Result<(), ApiError> {
ensure_email_domain_is_allowed(email)?;
let result = check_email(email).await.map_err(ApiError::Request)?;
if matches!(
result,
neverbounce::VerificationResult::Invalid
| neverbounce::VerificationResult::Disposable
) {
return Err(ApiError::Request(email_check_error_generic()));
}
Ok(())
}
impl AccountRegisterFlow {
async fn validate(
self,
@@ -1947,7 +2015,7 @@ impl ReadyAccountRegisterFlow {
}
}
/// Validate password account creation.
/// Validate password account creation.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -1975,7 +2043,7 @@ pub async fn validate_create_account_with_password(
Ok(())
}
/// Create account with a password.
/// Create account with a password.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -1996,12 +2064,16 @@ pub async fn create_account_with_password(
) -> Result<HttpResponse, ApiError> {
let new_account = new_account.into_inner();
validate_account_consent(new_account.account_consent)?;
if !check_hcaptcha(&req, new_account.challenge.as_deref().unwrap_or(""))
.await?
{
return Err(ApiError::Turnstile);
}
ensure_email_is_usable(&new_account.email).await?;
let mut transaction = pool.begin().await?;
let ready_flow = AccountRegisterFlow::from(new_account)
@@ -2024,7 +2096,7 @@ pub struct Login {
pub challenge: String,
}
/// Log in with a password.
/// Log in with a password.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2126,7 +2198,7 @@ async fn validate_2fa_code(
)
.map_err(|_| AuthenticationError::InvalidCredentials)?;
const TOTP_NAMESPACE: &str = "used_totp";
const TOTP_NAMESPACE: &str = "used_totp:v1";
let mut conn = redis.connect().await?;
// Check if TOTP has already been used
@@ -2185,7 +2257,7 @@ async fn validate_2fa_code(
}
}
/// Complete login with 2FA.
/// Complete login with 2FA.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2245,7 +2317,7 @@ pub async fn login_2fa(
}
}
/// Start 2FA setup.
/// Start 2FA setup.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2296,7 +2368,7 @@ pub async fn begin_2fa_flow(
}
}
/// Finish 2FA setup.
/// Finish 2FA setup.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2431,7 +2503,7 @@ pub struct Remove2FA {
pub code: String,
}
/// Remove 2FA.
/// Remove 2FA.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2531,7 +2603,7 @@ pub struct ResetPassword {
pub challenge: String,
}
/// Start password reset.
/// Start password reset.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2637,7 +2709,7 @@ pub struct ChangePassword {
pub new_password: Option<String>,
}
/// Change password.
/// Change password.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2803,7 +2875,7 @@ pub struct SetEmail {
pub email: String,
}
/// Set email address.
/// Set email address.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -2856,6 +2928,8 @@ pub async fn set_email(
));
}
ensure_email_is_usable(&email_address.email).await?;
let mut transaction = pool.begin().await?;
sqlx::query!(
@@ -2925,7 +2999,7 @@ pub async fn set_email(
Ok(HttpResponse::Ok().finish())
}
/// Resend verification email.
/// Resend verification email.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3000,7 +3074,7 @@ pub struct VerifyEmail {
pub flow: String,
}
/// Verify email address.
/// Verify email address.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3066,7 +3140,7 @@ pub async fn verify_email(
}
}
/// Subscribe to the newsletter.
/// Subscribe to the newsletter.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3115,7 +3189,7 @@ pub async fn subscribe_newsletter(
Ok(HttpResponse::NoContent().finish())
}
/// Get newsletter subscription status.
/// Get newsletter subscription status.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3165,7 +3239,7 @@ pub struct RegisterPasskeyResponse {
pub flow: String,
}
/// Start passkey registration.
/// Start passkey registration.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3265,7 +3339,7 @@ pub struct PasskeyResponse {
pub last_used: Option<chrono::DateTime<Utc>>,
}
/// Finish passkey registration.
/// Finish passkey registration.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3374,7 +3448,7 @@ pub struct AuthenticatePasskeyResponse {
pub flow: String,
}
/// Start passkey authentication.
/// Start passkey authentication.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3417,7 +3491,7 @@ pub struct AuthenticatePasskeyFinish {
pub credential: PublicKeyCredential,
}
/// Finish passkey authentication.
/// Finish passkey authentication.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3534,7 +3608,7 @@ pub async fn authenticate_passkey_finish(
}
}
/// List passkeys.
/// List passkeys.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3584,7 +3658,7 @@ pub struct RenamePasskey {
pub name: String,
}
/// Rename a passkey.
/// Rename a passkey.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -3639,7 +3713,7 @@ pub async fn rename_passkey(
Ok(HttpResponse::NoContent().finish())
}
/// Delete a passkey.
/// Delete a passkey.
#[utoipa::path(
context_path = "/auth",
tag = "auth",
@@ -70,11 +70,11 @@ pub async fn success_callback(
let body = base64::engine::general_purpose::STANDARD.encode(&body);
let redis_msg = serde_json::to_string(&Ok::<
let redis_msg = postcard::to_allocvec(&Ok::<
GotenbergDocument,
GotenbergError,
>(GotenbergDocument { body }))
.wrap_internal_err("failed to serialize document to JSON")?;
.wrap_internal_err("failed to serialize Redis document response")?;
redis
.lpush(
@@ -139,11 +139,11 @@ pub async fn error_callback(
.await
.wrap_internal_err("failed to get Redis connection")?;
let redis_msg = serde_json::to_string(&Err::<
let redis_msg = postcard::to_allocvec(&Err::<
GotenbergDocument,
GotenbergError,
>(error_body))
.wrap_internal_err("failed to serialize error to JSON")?;
.wrap_internal_err("failed to serialize Redis error response")?;
redis
.lpush(
+5 -1
View File
@@ -1,5 +1,7 @@
use crate::auth::checks::is_visible_collection;
use crate::auth::{filter_visible_collections, get_user_from_headers};
use crate::auth::{
filter_visible_collections, get_user_from_headers, require_verified_email,
};
use crate::database::PgPool;
use crate::database::models::{
collection_item, generate_collection_id, project_item,
@@ -76,6 +78,8 @@ pub async fn collection_create(
.await?
.1;
require_verified_email(&current_user)?;
let limits =
UserLimits::get_for_collections(&current_user, &client).await?;
if limits.current >= limits.max {
+4 -4
View File
@@ -22,8 +22,8 @@ use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::collections::BTreeMap;
const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve";
const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat";
const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve:v1";
const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat:v1";
const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v1";
const CONTENT_RESOLVE_CACHE_HEAT_WINDOW_SECONDS: i64 = 60 * 60 * 24;
@@ -340,7 +340,7 @@ async fn get_cached_resolve_content_plan(
};
match redis
.get_deserialized_from_json(CONTENT_RESOLVE_CACHE_NAMESPACE, cache_key)
.get_deserialized(CONTENT_RESOLVE_CACHE_NAMESPACE, cache_key)
.await
{
Ok(cached) => cached,
@@ -368,7 +368,7 @@ async fn set_cached_resolve_content_plan(
};
if let Err(error) = redis
.set_serialized_to_json(
.set_serialized(
CONTENT_RESOLVE_CACHE_NAMESPACE,
cache_key,
cached,
+5 -1
View File
@@ -2,7 +2,9 @@ use std::collections::HashMap;
use super::ApiError;
use crate::auth::checks::is_visible_organization;
use crate::auth::{filter_visible_projects, get_user_from_headers};
use crate::auth::{
filter_visible_projects, get_user_from_headers, require_verified_email,
};
use crate::database::PgPool;
use crate::database::models::team_item::DBTeamMember;
use crate::database::models::{
@@ -131,6 +133,8 @@ pub async fn organization_create(
.await?
.1;
require_verified_email(&current_user)?;
let limits =
UserLimits::get_for_organizations(&current_user, &pool).await?;
if limits.current >= limits.max {

Some files were not shown because too many files have changed in this diff Show More