From ec936c4e2c0e88440c1ad22bcd4c0ec50ef540d1 Mon Sep 17 00:00:00 2001 From: Et0h Date: Mon, 30 Jun 2014 23:33:11 +0100 Subject: [PATCH] Use media-player-error where appropriate --- syncplay/messages.py | 2 +- syncplay/players/mplayer.py | 2 +- syncplay/players/vlc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/syncplay/messages.py b/syncplay/messages.py index 4abe9e6..6f299d2 100644 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -73,6 +73,7 @@ en = { "player-path-error" : "Player path is not set properly", "hostname-empty-error" : "Hostname can't be empty", "empty-error" : "{} can't be empty", # Configuration + "media-player-error": "Media player error: \"{}\"", # Error line "arguments-missing-error" : "Some necessary arguments are missing, refer to --help", @@ -81,7 +82,6 @@ en = { "not-json-error" : "Not a json encoded string\n", "hello-arguments-error" : "Not enough Hello arguments\n", "version-mismatch-error" : "Mismatch between versions of client and server\n", - "vlc-error-echo": "VLC error: {}", # VLC error line "vlc-failed-connection": "Failed to connect to VLC. If you have not installed syncplay.lua then please refer to http://syncplay.pl/LUA/ for instructions.", "vlc-failed-noscript": "VLC has reported that the syncplay.lua interface script has not been installed. Please refer to http://syncplay.pl/LUA/ for instructions.", "vlc-failed-versioncheck": "This version of VLC is not supported by Syncplay. Please use VLC 2.", diff --git a/syncplay/players/mplayer.py b/syncplay/players/mplayer.py index e2fdf62..0e36be2 100644 --- a/syncplay/players/mplayer.py +++ b/syncplay/players/mplayer.py @@ -146,7 +146,7 @@ class MplayerPlayer(BasePlayer): self._filenameAsk.set() elif name == "exiting": if value != 'Quit': - self.reactor.callFromThread(self._client.ui.showErrorMessage, value, True) + self.reactor.callFromThread(self._client.ui.showErrorMessage, getMessage("en", "media-player-error").format(value), True) self.drop() @staticmethod diff --git a/syncplay/players/vlc.py b/syncplay/players/vlc.py index 9282bd3..8d9e30f 100644 --- a/syncplay/players/vlc.py +++ b/syncplay/players/vlc.py @@ -282,7 +282,7 @@ class VlcPlayer(BasePlayer): playerController._client.ui.showErrorMessage(getMessage("en", "vlc-failed-noscript").format(line), True) break elif "lua interface error" in line: - playerController._client.ui.showErrorMessage(getMessage("en", "vlc-error-echo").format(line), True) + playerController._client.ui.showErrorMessage(getMessage("en", "media-player-error").format(line), True) break threading.Thread.__init__(self, name="VLC Listener") asynchat.async_chat.__init__(self)