Skip to content

Commit 6be5b8f

Browse files
committed
Detect and warn the user if suppress-output is missing
1 parent 306f133 commit 6be5b8f

File tree

5 files changed

+48
-14
lines changed

5 files changed

+48
-14
lines changed

changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ and only contains the latest changes.
33
Its purpose is to be shown in Olympus when updating.
44

55
#changelog#
6-
Touch-ups of the French translation (again)
6+
Detect and warn the user if suppress-output is missing (macOS and Linux only)

src/lang.lua

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,17 @@ Most notably, the one-click installer buttons found on GameBanana
2929
were broken on macOS. To fix this, you will need to reinstall Olympus.
3030
Please go to the Everest website for further instructions.
3131
Keeping Olympus outdated can cause crashes in the future.]],
32+
olympus_is_not_completely_up_to_date_you = [[Olympus is not completely up-to-date.
33+
You might run into issues when trying to run Celeste or Lönn from Olympus.
34+
35+
This is because the integrated updater cannot update all the files.
36+
To fix this, reinstall Olympus following the instructions on the Everest website.]],
3237

3338
-- modinstaller.lua
3439
preparing_installation_of_s = [[Preparing installation of %s]],
40+
olympus_isn_t_fully_installed_please_run = [[Olympus isn't fully installed.
41+
Please run install.sh to install the one-click installer handler.
42+
install.sh can be found in your Olympus installation folder.]],
3543

3644
-- modupdater.lua
3745
updating_enabled_mods = [[Updating enabled mods]],
@@ -131,6 +139,12 @@ Please update to the latest version before installing Everest.]],
131139
These files could cause the installation of older Everest versions to fail.
132140
They should be removed before attempting to install Everest.
133141
]],
142+
it_is_required_to_install_xna_before_ins = [[It is required to install XNA before installing Everest.
143+
If this copy of Celeste comes from Steam, run Celeste normally to install XNA.
144+
Otherwise, manually install XNA using the button below.]],
145+
it_is_required_to_install_the_net_7_0_ru = [[It is required to install the .NET 7.0 Runtime before installing .NET Core versions of Everest.
146+
Click the button below to download the installer.
147+
Alternatively, you can manually install the runtime, then attempt the installation again.]],
134148

135149
-- scenes/gamebanana.lua
136150
gamebanana = [[GameBanana]],
@@ -415,9 +429,17 @@ Notamment, les boutons d'installation 1-Click sur GameBanana étaient
415429
non fonctionnels sur macOS. Pour corriger ça, tu dois réinstaller Olympus.
416430
Merci d'aller sur le site d'Everest pour plus d'informations.
417431
Ne pas mettre à jour Olympus pourrait causer des plantages à l'avenir.]],
432+
olympus_is_not_completely_up_to_date_you = [[Olympus n'est pas complètement à jour.
433+
Tu risques de rencontrer des erreurs en essayant de lancer Celeste ou Lönn depuis Olympus.
434+
435+
Les mises à jour intégrées dans Olympus ne mettent pas à jour tous les fichiers.
436+
Pour corriger le problème, suis les instructions sur le site d'Everest pour réinstaller Olympus.]],
418437

419438
-- modinstaller.lua
420439
preparing_installation_of_s = [[Préparation de l'installation de %s]],
440+
olympus_isn_t_fully_installed_please_run = [[Olympus n'est pas complètement installé.
441+
Lance install.sh pour installer le gestionnaire d'installation 1-Click.
442+
install.sh se trouve dans le dossier d'installation d'Olympus.]],
421443

422444
-- modupdater.lua
423445
updating_enabled_mods = [[Mise à jour des mods activés]],
@@ -518,6 +540,12 @@ Installe la dernière version du jeu avant d'installer Everest.]],
518540
Ces fichiers pourraient faire échouer l'installation de vieilles versions d'Everest.
519541
Il faudrait les supprimer avant d'installer Everest.
520542
]],
543+
it_is_required_to_install_xna_before_ins = [[Il est nécessaire d'installer XNA avant d'installer Everest.
544+
Si ta copie de Celeste vient de Steam, lance le jeu pour installer XNA.
545+
Sinon, installe XNA manuellement avec le bouton ci-dessous.]],
546+
it_is_required_to_install_the_net_7_0_ru = [[Il est nécessaire d'installer le runtime .NET 7.0 avant d'installer les versions "Core" d'Everest.
547+
Clique sur le bouton ci-dessous pour télécharger le programme d'installation.
548+
Tu peux aussi installer le runtime manuellement, puis réessayer d'installer Everest.]],
521549

522550
-- scenes/gamebanana.lua
523551
gamebanana = [[GameBanana]],
@@ -792,7 +820,7 @@ local function get(key)
792820
value, _ = value:gsub("S%%", "%%S")
793821
return value
794822
end
795-
return langs[lang][key] or langs["en"][key]
823+
return langs[lang][key] or langs["en"][key] or ('[' .. key .. ']')
796824
end
797825

798826
return { get = get }

src/main.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,21 @@ function love.load(args)
641641
})
642642
end
643643

644+
local suppressOutputPath = fs.joinpath(fs.getcwd(), "suppress-output")
645+
if userOS ~= "Windows" and not fs.isFile(suppressOutputPath) then
646+
log.warning("Output suppresser file missing!", suppressOutputPath)
647+
alert({
648+
body = lang.get("olympus_is_not_completely_up_to_date_you"),
649+
buttons = {
650+
{ lang.get("open_everest_website"), function(container)
651+
container:close(lang.get("ok"))
652+
utils.openURL("https://everestapi.github.io/#olympus")
653+
end },
654+
{ lang.get("close") }
655+
}
656+
})
657+
end
658+
644659
config.save()
645660
end
646661

src/modinstaller.lua

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ function modinstaller.register()
5252
local p = io.popen([["xdg-mime" "query" "default" "x-scheme-handler/everest"]])
5353
local data = utils.trim(p:read("*a")) or ""
5454
if p:close() and data == "" then
55-
alert([[
56-
Olympus isn't fully installed.
57-
Please run install.sh to install the one-click installer handler.
58-
install.sh can be found in your Olympus installation folder.]])
55+
alert(lang.get("olympus_isn_t_fully_installed_please_run"))
5956
end
6057

6158
return false

src/scenes/everest.lua

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ lang.get("use_the_newest_version_for_more_features"), { 0.3, 0.8, 0.5, 1 }, "sta
126126
not (registry.getKey([[HKLM\SOFTWARE\WOW6432Node\Microsoft\XNA\Framework\v4.0\Installed]]) or
127127
registry.getKey([[HKLM\SOFTWARE\Microsoft\XNA\Framework\v4.0\Installed]])) then
128128
alert({
129-
body = [[
130-
It is required to install XNA before installing Everest.
131-
If this copy of Celeste comes from Steam, run Celeste normally to install XNA.
132-
Otherwise, manually install XNA using the button below.]],
129+
body = lang.get("it_is_required_to_install_xna_before_ins"),
133130
buttons = {
134131
{ lang.get("install_xna"), function(container)
135132
container:close(lang.get("ok"))
@@ -176,10 +173,7 @@ Otherwise, manually install XNA using the button below.]],
176173

177174
if not (runtimeOutput and runtimeOutput:match("Microsoft.NETCore.App 7.")) then
178175
alert({
179-
body = [[
180-
It is required to install the .NET 7.0 Runtime before installing .NET Core versions of Everest.
181-
Click the button below to download the installer.
182-
Alternatively, you can manually install the runtime, then attempt the installation again.]],
176+
body = lang.get("it_is_required_to_install_the_net_7_0_ru"),
183177
buttons = {
184178
{ lang.get("install_runtime"), function(container)
185179
container:close(lang.get("ok"))

0 commit comments

Comments
 (0)