From 99ce9afd638a784ebfe16964fed0e75240c0da5e Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:20:32 +0100 Subject: [PATCH] Launcher: the Nightly setting says reviewers pick its pull requests nightly-2: a Nightly can include pull requests not reviewed yet, picked by trusted reviewers (docs/release-flow.md "Nightly channel"). The Settings row says so, in English, French and Russian. Co-Authored-By: Claude Opus 5.5 --- launcher/lang/fr.json | 2 +- launcher/lang/ru.json | 2 +- launcher/src/main.rs | 4 +++- launcher/src/nightly.rs | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/launcher/lang/fr.json b/launcher/lang/fr.json index 315924ce1..b92252a92 100644 --- a/launcher/lang/fr.json +++ b/launcher/lang/fr.json @@ -160,7 +160,7 @@ "Prepared for Minecraft {version}": "Préparé pour Minecraft {version}", "Prepared for Minecraft {version}, without its sounds: the game will be silent. Prepare again to copy them from your Minecraft install.": "Préparé pour Minecraft {version}, sans ses sons : le jeu sera muet. Préparez à nouveau pour les copier depuis votre installation de Minecraft.", "Nightly builds": "Versions Nightly", - "Reviewed fixes not released yet; may break.": "Des correctifs relus, pas encore publiés ; peut casser.", + "Can include pull requests not reviewed yet, picked by trusted reviewers; may break.": "Peut inclure des pull requests pas encore relues, choisies par des relecteurs de confiance ; peut casser.", "Plays in its own Nightly instance: your worlds and the release stay as they are.": "Se joue dans sa propre instance Nightly : vos mondes et la version publiée restent tels quels.", "Installing the nightly, {percent}%": "Installation de la Nightly, {percent} %", "The nightly could not be installed: {error}": "La Nightly n'a pas pu être installée : {error}", diff --git a/launcher/lang/ru.json b/launcher/lang/ru.json index 0464b8808..753132e4b 100644 --- a/launcher/lang/ru.json +++ b/launcher/lang/ru.json @@ -160,7 +160,7 @@ "Prepared for Minecraft {version}": "Подготовлено для Minecraft {version}", "Prepared for Minecraft {version}, without its sounds: the game will be silent. Prepare again to copy them from your Minecraft install.": "Подготовлено для Minecraft {version}, но без звуков: игра будет беззвучной. Подготовьте заново, чтобы скопировать их из вашей установки Minecraft.", "Nightly builds": "Ночные сборки", - "Reviewed fixes not released yet; may break.": "Проверенные исправления, ещё не вышедшие в релиз; что-то может сломаться.", + "Can include pull requests not reviewed yet, picked by trusted reviewers; may break.": "Может включать ещё не проверенные pull request'ы, выбранные доверенными ревьюерами; что-то может сломаться.", "Plays in its own Nightly instance: your worlds and the release stay as they are.": "Запускается в отдельной сборке Nightly: ваши миры и релиз остаются как есть.", "Installing the nightly, {percent}%": "Установка ночной сборки, {percent}%", "The nightly could not be installed: {error}": "Не удалось установить ночную сборку: {error}", diff --git a/launcher/src/main.rs b/launcher/src/main.rs index 78cd56bd7..eefc653ac 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -2901,7 +2901,9 @@ impl Launcher { this.set_nightly(!this.settings.nightly); cx.notify(); })); - let what = tr("Reviewed fixes not released yet; may break."); + let what = tr( + "Can include pull requests not reviewed yet, picked by trusted reviewers; may break.", + ); let status = match (&self.nightly_progress, &self.nightly_error) { _ if !on => tr("Plays in its own Nightly instance: your worlds and the release stay as they are.") .to_string(), diff --git a/launcher/src/nightly.rs b/launcher/src/nightly.rs index d5f75e8ab..4aed66434 100644 --- a/launcher/src/nightly.rs +++ b/launcher/src/nightly.rs @@ -1,5 +1,6 @@ -//! Nightly (docs/release-flow.md "Nightly channel"): an opt-in build of reviewed fixes not released -//! yet, published each night as the `nightly` pre-release. Off by default (`Settings::nightly`). +//! Nightly (docs/release-flow.md "Nightly channel"): an opt-in build of main plus pull requests +//! picked by trusted reviewers, some not reviewed yet, published as the `nightly` pre-release each +//! night and when a reviewer asks. Off by default (`Settings::nightly`). //! //! It never touches the release: it installs as its own version, `nightly--`, and plays //! in its own instance, "Nightly" (`instances/nightly/` in the game's home), so the player's worlds