Skip to content

Commit

Permalink
Show an error if the select wine doesn't exist (#1912)
Browse files Browse the repository at this point in the history
* Show an error if the select wine doesn't exist

* revert unneeded changes

* Check in prepareWineLaunch too

* remove unneeded comment

* Update doc of validWine method
  • Loading branch information
arielj committed Oct 17, 2022
1 parent 0973599 commit 6626721
Show file tree
Hide file tree
Showing 42 changed files with 105 additions and 20 deletions.
1 change: 1 addition & 0 deletions public/locales/az/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Yeniləmə xətası"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Şərab Versiyası Seçilməyib. Oyun Parametrlərini yoxlayın!",
"title": "Şərab tapılmadı"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/be/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Грешка при обновяването"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Няма избрана версия на Wine. Проверете настройките на играта!",
"title": "Wine не е намерен"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/bs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Greška ažuriranja"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nije odabrana Wine verzija. Provjerite postavke video igre!",
"title": "Wine nije pronađen"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ca/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No s'ha seleccionat cap versió del Wine. Comprova la configuració del joc.",
"title": "No s'ha trobat el Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Není vybrána žádná verze Wine. Zkontrolujte nastavení hry!",
"title": "Wine nenalezen"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Keine Wine-Version ausgewählt. Überprüfe die Spieleinstellungen!",
"title": "Wine nicht gefunden"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/el/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Σφάλμα ενημέρωσης"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Δεν επιλέχθηκε έκδοση Wine. Ελέγξτε τις ρυθμίσεις παιχνιδιού!",
"title": "Το Wine δεν βρέθηκε"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Error al actualizar"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No se ha seleccionado la versión de Wine. ¡Comprueba la configuración del juego!",
"title": "No se ha encontrado Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/et/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Viga uuendamisel"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Wine'i versiooni pole valitud. Kontrolli mängu seadeid!",
"title": "Wine'i ei leitud"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/eu/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Eguneraketa errorea"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Ez da Wine bertsioa hautatu. Egiaztatu jokoaren konfigurazioa!",
"title": "Wine ez da aurkitu"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/fa/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "نسخه ای از Wine انتخاب نشده است. تنظیمات بازی را چک کنید!",
"title": "Wine یافت نشد"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/fi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Winen versiota ei ole valittu. Tarkista peliasetukset!",
"title": "Wineä ei löytynyt"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine non trouvé"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/gl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No se seleccionou a versión de Wine. ¡Comprueba a configuración do xogo!",
"title": "No se atopou Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/hr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/hu/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nincs kiválasztott Wine verzió. Ellenőrizd a játék beállításait!",
"title": "Wine nem található"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/id/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Tidak Ada Versi Wine yang Dipilih. Periksa Pengaturan Gim!",
"title": "Wine Tidak Ditemukan"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nessuna versione di Wine selezionata. Controlla le impostazioni del gioco!",
"title": "Wine non trovato"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Wine 버전이 선택되지 않았습니다. 게임 설정을 확인하세요!",
"title": "Wine을 찾을 수 없음"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ml/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/nb_NO/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Oppdateringsfeil"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Ingen Wine-versjon valgt. Sjekk spill-innstillingene.",
"title": "Fant ikke Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Błąd aktualizacji"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nie wybrano wersji Wine. Sprawdź ustawienia gry!",
"title": "Nie znaleziono Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt_BR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nenhuma Versão do wine selecionada. Cheque as configurações do jogo!",
"title": "Wine Não Encontrado"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ro/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Eroare de actualizare"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Nicio versiune Wine selectată. Verificați setările jocului!",
"title": "Wine nu a fost găsit"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Ошибка обновления"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Не выбрана версия Wine. Проверьте настройки игры!",
"title": "Wine не найден"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/sk/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/sv/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Problem vid uppdatering"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Ingen Wine version vald. Kontrollera spelinställningar!",
"title": "Wine hittades ej"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/ta/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "No Wine Version Selected. Check Game Settings!",
"title": "Wine Not Found"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/tr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Wine Sürümü Seçilmedi. Oyun Ayarlarını Denetleyin!",
"title": "Wine Bulunamadı"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/uk/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Помилка оновлення"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Не обрана версія Wine. Перевірте налаштування гри!",
"title": "Wine не знайдено"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "Chưa chọn phiên bản Wine. Kiểm tra phần cài đặt!",
"title": "Không tìm thấy Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hans/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "更新错误"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "未选择 Wine 版本。检查游戏设置!",
"title": "未找到 Wine"
},
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hant/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"title": "Update Error"
},
"wine-not-found": {
"invalid": "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
"message": "沒有選擇之 Wine 版本。檢查遊戲設定!",
"title": "未找到Wine"
},
Expand Down
10 changes: 6 additions & 4 deletions src/backend/gog/games.ts
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,12 @@ class GOGGame extends Game {
this.logFileLocation,
`Launch aborted: ${wineLaunchPrepFailReason}`
)
showErrorBoxModalAuto({
title: t('box.error.launchAborted', 'Launch aborted'),
error: wineLaunchPrepFailReason!
})
if (wineLaunchPrepFailReason) {
showErrorBoxModalAuto({
title: t('box.error.launchAborted', 'Launch aborted'),
error: wineLaunchPrepFailReason
})
}
return false
}

Expand Down

0 comments on commit 6626721

Please sign in to comment.