diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json index 75ef336e77..bb8939d201 100644 --- a/apps/app-frontend/src/locales/ar-SA/index.json +++ b/apps/app-frontend/src/locales/ar-SA/index.json @@ -236,9 +236,6 @@ "app.project.install-context.back-to-browse": { "message": "العودة إلى الاستكشاف" }, - "app.project.install-context.install-content-to-instance": { - "message": "تثبيت المحتويات الى النموذج" - }, "app.settings.developer-mode-enabled": { "message": "تم تفعيل وضع المطوّر." }, diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json index 3996f59835..482b6b3947 100644 --- a/apps/app-frontend/src/locales/cs-CZ/index.json +++ b/apps/app-frontend/src/locales/cs-CZ/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Zpět k Objevování" }, - "app.project.install-context.install-content-to-instance": { - "message": "Nainstalovat obsah do instance" - }, "app.settings.developer-mode-enabled": { "message": "Vývojářský režim povolen." }, diff --git a/apps/app-frontend/src/locales/da-DK/index.json b/apps/app-frontend/src/locales/da-DK/index.json index 1ac5619f1e..f8635eb1de 100644 --- a/apps/app-frontend/src/locales/da-DK/index.json +++ b/apps/app-frontend/src/locales/da-DK/index.json @@ -287,9 +287,6 @@ "app.project.install-context.back-to-browse": { "message": "Tilbage til udforsk" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installer indhold til instance" - }, "app.settings.developer-mode-enabled": { "message": "Udvikler-tilstand aktiveret." }, diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json index 7b0b52ac5e..dae3dbffbe 100644 --- a/apps/app-frontend/src/locales/de-CH/index.json +++ b/apps/app-frontend/src/locales/de-CH/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Zurück zu Entdecken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Inhalt in Instanz installieren" - }, "app.settings.developer-mode-enabled": { "message": "Entwicklermodus aktiviert." }, diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json index ccbbe77b5f..558a280a39 100644 --- a/apps/app-frontend/src/locales/de-DE/index.json +++ b/apps/app-frontend/src/locales/de-DE/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Zurück zum Entdecken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Inhalt in Instanz installieren" - }, "app.settings.developer-mode-enabled": { "message": "Entwicklermodus aktiviert." }, diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json index 9b8fdec3b9..198dff5a44 100644 --- a/apps/app-frontend/src/locales/en-US/index.json +++ b/apps/app-frontend/src/locales/en-US/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Back to discover" }, - "app.project.install-context.install-content-to-instance": { - "message": "Install content to instance" - }, "app.settings.developer-mode-enabled": { "message": "Developer mode enabled." }, diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json index 8b3bfc865c..ac173f59b9 100644 --- a/apps/app-frontend/src/locales/es-419/index.json +++ b/apps/app-frontend/src/locales/es-419/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Volver al explorador" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar contenido a la instancia" - }, "app.settings.developer-mode-enabled": { "message": "Modo desarrollador activado." }, diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json index 863c85f0fd..67e8be3c48 100644 --- a/apps/app-frontend/src/locales/es-ES/index.json +++ b/apps/app-frontend/src/locales/es-ES/index.json @@ -305,9 +305,6 @@ "app.project.install-context.back-to-browse": { "message": "Volver a descubrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar contenido" - }, "app.settings.developer-mode-enabled": { "message": "Modo desarrollador activado." }, diff --git a/apps/app-frontend/src/locales/fi-FI/index.json b/apps/app-frontend/src/locales/fi-FI/index.json index 5f5020e903..9a0418e64a 100644 --- a/apps/app-frontend/src/locales/fi-FI/index.json +++ b/apps/app-frontend/src/locales/fi-FI/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Takaisin sisällön löytöön" }, - "app.project.install-context.install-content-to-instance": { - "message": "Asenna sisältöä instanssiin" - }, "app.settings.developer-mode-enabled": { "message": "Kehittäjätila käytössä." }, diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json index 9461752870..7e26279c1d 100644 --- a/apps/app-frontend/src/locales/fr-FR/index.json +++ b/apps/app-frontend/src/locales/fr-FR/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Retour vers la page découvrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installer du contenu à l'instance" - }, "app.settings.developer-mode-enabled": { "message": "Mode développeur activé." }, diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json index 62562df7f7..fc3de4a589 100644 --- a/apps/app-frontend/src/locales/hu-HU/index.json +++ b/apps/app-frontend/src/locales/hu-HU/index.json @@ -302,9 +302,6 @@ "app.project.install-context.back-to-browse": { "message": "Vissza a böngészéshez" }, - "app.project.install-context.install-content-to-instance": { - "message": "Tartalom telepítése a profilba" - }, "app.settings.developer-mode-enabled": { "message": "Fejlesztői mód bekapcsolva." }, diff --git a/apps/app-frontend/src/locales/id-ID/index.json b/apps/app-frontend/src/locales/id-ID/index.json index 152b175cc4..c097a00486 100644 --- a/apps/app-frontend/src/locales/id-ID/index.json +++ b/apps/app-frontend/src/locales/id-ID/index.json @@ -293,9 +293,6 @@ "app.project.install-context.back-to-browse": { "message": "Kembali ke halaman pencarian" }, - "app.project.install-context.install-content-to-instance": { - "message": "Pasang konten ke instans" - }, "app.settings.developer-mode-enabled": { "message": "Mode pengembang dihidupkan." }, diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json index 28adfc3dba..392ee48a92 100644 --- a/apps/app-frontend/src/locales/it-IT/index.json +++ b/apps/app-frontend/src/locales/it-IT/index.json @@ -410,9 +410,6 @@ "app.project.install-context.back-to-browse": { "message": "Torna a Esplora" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installa il contenuto nell'istanza" - }, "app.settings.developer-mode-enabled": { "message": "Modalità sviluppatore attiva." }, diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json index dcfe993ccb..a7aa0636a4 100644 --- a/apps/app-frontend/src/locales/ko-KR/index.json +++ b/apps/app-frontend/src/locales/ko-KR/index.json @@ -287,9 +287,6 @@ "app.project.install-context.back-to-browse": { "message": "탐색으로 돌아가기" }, - "app.project.install-context.install-content-to-instance": { - "message": "인스턴스에 콘텐츠 설치" - }, "app.settings.developer-mode-enabled": { "message": "개발자 모드가 활성화되었습니다." }, diff --git a/apps/app-frontend/src/locales/ms-MY/index.json b/apps/app-frontend/src/locales/ms-MY/index.json index 8d1c52d97c..d34fd5f1a2 100644 --- a/apps/app-frontend/src/locales/ms-MY/index.json +++ b/apps/app-frontend/src/locales/ms-MY/index.json @@ -278,9 +278,6 @@ "app.project.install-context.back-to-browse": { "message": "Kembali menemukan" }, - "app.project.install-context.install-content-to-instance": { - "message": "Pasang kandungan ke dalam pemasangan" - }, "app.settings.developer-mode-enabled": { "message": "Mod pembangun didayakan." }, diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json index d33e2336e6..907cc5780e 100644 --- a/apps/app-frontend/src/locales/nl-NL/index.json +++ b/apps/app-frontend/src/locales/nl-NL/index.json @@ -293,9 +293,6 @@ "app.project.install-context.back-to-browse": { "message": "Terug naar Ontdekken" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installeer content naar instantie" - }, "app.settings.developer-mode-enabled": { "message": "Ontwikkelaarsmodus ingeschakeld." }, diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json index 0a52fa2be7..6433fdad8a 100644 --- a/apps/app-frontend/src/locales/pl-PL/index.json +++ b/apps/app-frontend/src/locales/pl-PL/index.json @@ -410,9 +410,6 @@ "app.project.install-context.back-to-browse": { "message": "Powróć do odkrywania" }, - "app.project.install-context.install-content-to-instance": { - "message": "Zainstaluj zasoby do instancji" - }, "app.settings.developer-mode-enabled": { "message": "Tryb dewelopera włączony." }, diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json index 4ca721a2f6..0faff2c068 100644 --- a/apps/app-frontend/src/locales/pt-BR/index.json +++ b/apps/app-frontend/src/locales/pt-BR/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Voltar a descobrir" }, - "app.project.install-context.install-content-to-instance": { - "message": "Instalar conteúdo para a instância" - }, "app.settings.developer-mode-enabled": { "message": "Modo desenvolvedor ativado." }, diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json index a722d690ee..cbfc8689c6 100644 --- a/apps/app-frontend/src/locales/ru-RU/index.json +++ b/apps/app-frontend/src/locales/ru-RU/index.json @@ -404,9 +404,6 @@ "app.project.install-context.back-to-browse": { "message": "Вернуться к поиску" }, - "app.project.install-context.install-content-to-instance": { - "message": "Установка контента в сборку" - }, "app.settings.developer-mode-enabled": { "message": "Режим разработчика включён." }, diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json index 058ea2ba20..f739728485 100644 --- a/apps/app-frontend/src/locales/sv-SE/index.json +++ b/apps/app-frontend/src/locales/sv-SE/index.json @@ -401,9 +401,6 @@ "app.project.install-context.back-to-browse": { "message": "Tillbaka till upptäck" }, - "app.project.install-context.install-content-to-instance": { - "message": "Installera innehåll till instans" - }, "app.settings.developer-mode-enabled": { "message": "Utvecklarläge aktiverat." }, diff --git a/apps/app-frontend/src/locales/th-TH/index.json b/apps/app-frontend/src/locales/th-TH/index.json index d5e5100dd3..3af3e914bf 100644 --- a/apps/app-frontend/src/locales/th-TH/index.json +++ b/apps/app-frontend/src/locales/th-TH/index.json @@ -293,9 +293,6 @@ "app.project.install-context.back-to-browse": { "message": "กลับไปที่หน้าค้นหา" }, - "app.project.install-context.install-content-to-instance": { - "message": "ติดตั้งเนื้อหาลงสู่อินสแตนซ์" - }, "app.settings.developer-mode-enabled": { "message": "โหมดนักพัฒนาเปิดอยู่" }, diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json index e39707996b..fa780a11a4 100644 --- a/apps/app-frontend/src/locales/tr-TR/index.json +++ b/apps/app-frontend/src/locales/tr-TR/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "Keşfete geri dön" }, - "app.project.install-context.install-content-to-instance": { - "message": "İçeriği kuruluma yükle" - }, "app.settings.developer-mode-enabled": { "message": "Geliştirici modu açıldı." }, diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json index 1ac448c6b7..5ef31d8d47 100644 --- a/apps/app-frontend/src/locales/uk-UA/index.json +++ b/apps/app-frontend/src/locales/uk-UA/index.json @@ -293,9 +293,6 @@ "app.project.install-context.back-to-browse": { "message": "Повернутися до дослідження" }, - "app.project.install-context.install-content-to-instance": { - "message": "Установити вміст до профілю" - }, "app.settings.developer-mode-enabled": { "message": "Увімкнено режим розробника." }, diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json index 7c0465ebf6..66019bc2d9 100644 --- a/apps/app-frontend/src/locales/vi-VN/index.json +++ b/apps/app-frontend/src/locales/vi-VN/index.json @@ -293,9 +293,6 @@ "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.settings.developer-mode-enabled": { "message": "Chế độ nhà phát triển đã được bật." }, diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json index 73c6437d42..0517496e85 100644 --- a/apps/app-frontend/src/locales/zh-CN/index.json +++ b/apps/app-frontend/src/locales/zh-CN/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "返回发现页" }, - "app.project.install-context.install-content-to-instance": { - "message": "将内容安装到实例中" - }, "app.settings.developer-mode-enabled": { "message": "开发者模式已启用。" }, diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json index 10b15aca8f..94794eac91 100644 --- a/apps/app-frontend/src/locales/zh-TW/index.json +++ b/apps/app-frontend/src/locales/zh-TW/index.json @@ -413,9 +413,6 @@ "app.project.install-context.back-to-browse": { "message": "返回瀏覽" }, - "app.project.install-context.install-content-to-instance": { - "message": "將內容安裝至實例" - }, "app.settings.developer-mode-enabled": { "message": "開發人員模式已啟用。" }, diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue index 73cd969063..b535c228f3 100644 --- a/apps/app-frontend/src/pages/Browse.vue +++ b/apps/app-frontend/src/pages/Browse.vue @@ -69,6 +69,7 @@ const debugLog = useDebugLogger('Browse') const router = useRouter() const route = useRoute() const themeStore = useTheming() +const browseRouteActive = computed(() => route.path.startsWith('/browse/')) const serverSetupModalRef = ref | null>(null) const serverInstallContent = createServerInstallContent({ serverSetupModalRef }) provideServerInstallContent(serverInstallContent) @@ -487,6 +488,9 @@ function resetInstanceContext() { watch( () => route.params.projectType as ProjectType, async (newType) => { + if (!browseRouteActive.value) { + return + } if (isSetupServerContext.value) { enforceSetupModpackRoute(newType) if (newType !== 'modpack') return @@ -954,6 +958,7 @@ const lockedFilterMessages = computed(() => ({ const searchState = useBrowseSearch({ projectType, tags, + active: browseRouteActive, providedFilters: combinedProvidedFilters, search, persistentQueryParams: ['i', 'ai', 'shi', 'sid', 'wid', 'from'], @@ -1029,6 +1034,9 @@ onUnmounted(() => { }) function getProjectBrowseQuery() { + if (!browseRouteActive.value) { + return undefined + } if (!installContext.value) return undefined return { ...route.query, @@ -1119,7 +1127,7 @@ provideBrowseManager({ @browse-modpacks="() => {}" @create="handleServerModpackFlowCreate" /> - + diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue index 3e846ea78c..8e94005e8d 100644 --- a/apps/app-frontend/src/pages/project/Index.vue +++ b/apps/app-frontend/src/pages/project/Index.vue @@ -228,10 +228,6 @@ 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', @@ -358,7 +354,7 @@ const projectInstallContext = computed(() => { iconSrc: instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : null, backUrl: projectBrowseBackUrl.value, backLabel: formatMessage(messages.backToBrowse), - heading: formatMessage(messages.installContentToInstance), + heading: formatMessage(commonMessages.installingContentLabel), } } diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index f96e7e78bf..f3fb970df9 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -3365,6 +3365,9 @@ "project.gallery.title": { "message": "Gallery" }, + "project.install-context.back-to-discover": { + "message": "Back to discover" + }, "project.license.error": { "message": "License text could not be retrieved." }, diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue index 672d1b7cea..bdd992471e 100644 --- a/apps/frontend/src/pages/[type]/[project].vue +++ b/apps/frontend/src/pages/[type]/[project].vue @@ -95,6 +95,22 @@ @download="triggerDownloadAnimation" /> +
+ +
+