Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use media-player-error where appropriate

Browse Source
This commit is contained in:
Et0h 2014-06-30 23:33:11 +01:00
parent 4c695fc0be
commit ec936c4e2c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syncplay/messages.py
View File

@ -73,6 +73,7 @@ en = {
"player-path-error" : "Player path is not set properly", "player-path-error" : "Player path is not set properly",
"hostname-empty-error" : "Hostname can't be empty", "hostname-empty-error" : "Hostname can't be empty",
"empty-error" : "{} can't be empty", # Configuration "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", "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", "not-json-error" : "Not a json encoded string\n",
"hello-arguments-error" : "Not enough Hello arguments\n", "hello-arguments-error" : "Not enough Hello arguments\n",
"version-mismatch-error" : "Mismatch between versions of client and server\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-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-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.", "vlc-failed-versioncheck": "This version of VLC is not supported by Syncplay. Please use VLC 2.",

2
syncplay/players/mplayer.py
View File

@ -146,7 +146,7 @@ class MplayerPlayer(BasePlayer):
self._filenameAsk.set() self._filenameAsk.set()
elif name == "exiting": elif name == "exiting":
if value != 'Quit': 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() self.drop()
@staticmethod @staticmethod

2
syncplay/players/vlc.py
View File

@ -282,7 +282,7 @@ class VlcPlayer(BasePlayer):
playerController._client.ui.showErrorMessage(getMessage("en", "vlc-failed-noscript").format(line), True) playerController._client.ui.showErrorMessage(getMessage("en", "vlc-failed-noscript").format(line), True)
break break
elif "lua interface error" in line: 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 break
threading.Thread.__init__(self, name="VLC Listener") threading.Thread.__init__(self, name="VLC Listener")
asynchat.async_chat.__init__(self) asynchat.async_chat.__init__(self)