From afa037611db8f389a3fc13fda4503ace2a661ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= Date: Wed, 24 Apr 2019 23:09:03 +0200 Subject: [PATCH] Show an error is an internet radio has no sources to load --- .../org/airsonic/player/i18n/ResourceBundle_en.properties | 1 + .../org/airsonic/player/i18n/ResourceBundle_fr.properties | 1 + airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties index 63461c2f..1e9809ec 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties @@ -99,6 +99,7 @@ playlist.empty=Play queue empty. playlist.toast.appendtoplaylist=Playlist updated. playlist.toast.saveasplaylist=Playlist saved. playlist.toast.saveplayqueue=Play queue saved. +playlist.toast.radioerror=Sorry, an error occurred while trying to load the internet radio. playlist.missing=Missing playlist2.noplaylists=You haven't created any playlists yet. diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties index 7d7a1ebc..a29afecc 100644 --- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties +++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties @@ -99,6 +99,7 @@ playlist.empty=Liste de lecture vide playlist.toast.appendtoplaylist=Playlist mise \u00e0 jour. playlist.toast.saveasplaylist=Playlist sauvegard\u00e9e. playlist.toast.saveplayqueue=Liste de lecture sauvegard\u00e9. +playlist.toast.radioerror=D\u00E9sol\u00E9, une erreur s'est produite pendant le chargement de la radio. playlist.missing=Manquant playlist2.noplaylists=Vous n'avez pas encore cr\u00e9er de playlist. diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp index 2bd31889..ec35fefc 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp @@ -467,6 +467,12 @@ shuffleRadioEnabled = playQueue.shuffleRadioEnabled; internetRadioEnabled = playQueue.internetRadioEnabled; + // If an internet radio has no sources, display a message to the user. + if (internetRadioEnabled && songs.length == 0) { + top.main.$().toastmessage("showErrorToast", ""); + onStop(); + } + if ($("#start")) { $("#start").toggle(!playQueue.stopEnabled); $("#stop").toggle(playQueue.stopEnabled);