From 38fcb10abc004df1068925f0d677e216903ac043 Mon Sep 17 00:00:00 2001
From: Et0h <boldly@gmail.com>
Date: Tue, 30 Dec 2014 12:03:24 +0000
Subject: [PATCH] Rename 'RE (ready)' command to 'T' (toggle) in ConsoleUI &
 add English help text (+RU/DE placeholders)

---
 syncplay/constants.py    | 2 +-
 syncplay/messages.py     | 3 +++
 syncplay/ui/consoleUI.py | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/syncplay/constants.py b/syncplay/constants.py
index 1d2475f..fe27f69 100644
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -60,7 +60,7 @@ COMMANDS_ROOM = ["r", "room"]
 COMMANDS_HELP = ['help', 'h', '?', '/?', r'\?']
 COMMANDS_CREATE = ['c','create']
 COMMANDS_AUTH = ['a','auth']
-COMMANDS_READY = ['re']
+COMMANDS_TOGGLE = ['t','toggle']
 MPC_MIN_VER = "1.6.4"
 VLC_MIN_VERSION = "2.0.0"
 VLC_INTERFACE_MIN_VERSION = "0.2.4"
diff --git a/syncplay/messages.py b/syncplay/messages.py
index 837dda4..03c47d6 100755
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -64,6 +64,7 @@ en = {
       "commandlist-notification/pause" : "\tp - toggle pause",
       "commandlist-notification/seek" : "\t[s][+-]time - seek to the given value of time, if + or - is not specified it's absolute time in seconds or min:sec",
       "commandlist-notification/help" : "\th - this help",
+      "commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not",
       "commandlist-notification/create" : "\tc [name] - create controlled room using name of current room",
       "commandlist-notification/auth" : "\ta [password] - authenticate as room controller with controller password",
       "syncplay-version-notification" : "Syncplay version: {}",  # syncplay.version
@@ -383,6 +384,7 @@ ru = {
       "commandlist-notification/pause" : u"\tp - вкл./выкл. паузу",
       "commandlist-notification/seek" : u"\t[s][+-]time - перемотать к заданному моменту времени, если не указан + или -, то время считается абсолютным (от начала файла) в секундах или мин:сек",
       "commandlist-notification/help" : u"\th - помощь",
+      "commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not", # TODO: Translate into Russian
       "commandlist-notification/create" : u"\tc [name] - create controlled room using name of current room", # TODO: Translate into Russian
       "commandlist-notification/auth" : u"\ta [password] - authenticate as room controller with controller password", # TODO: Translate into Russian
       "syncplay-version-notification" : u"Версия Syncplay: {}",  # syncplay.version
@@ -701,6 +703,7 @@ de = {
       "commandlist-notification/pause" : u"\tp - Pausieren / weiter",
       "commandlist-notification/seek" : u"\t[s][+-]Zeit - zu einer bestimmten Zeit spulen, ohne + oder - wird als absolute Zeit gewertet; Angabe in Sekunden oder Minuten:Sekunden",
       "commandlist-notification/help" : u"\th - Diese Hilfe",
+      "commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not", # TODO: Translate into German
       "commandlist-notification/create" : u"\tc [name] - erstelle zentral gesteuerten Raum mit dem aktuellen Raumnamen",
       "commandlist-notification/auth" : u"\ta [password] - authentifiziere als Raumleiter mit Passwort",
       "syncplay-version-notification" : u"Syncplay Version: {}",  # syncplay.version
diff --git a/syncplay/ui/consoleUI.py b/syncplay/ui/consoleUI.py
index f113d80..536d56e 100644
--- a/syncplay/ui/consoleUI.py
+++ b/syncplay/ui/consoleUI.py
@@ -152,7 +152,7 @@ class ConsoleUI(threading.Thread):
         elif command.group('command') in constants.COMMANDS_AUTH:
             controlpassword = command.group('parameter')
             self._syncplayClient.identifyAsController(controlpassword)
-        elif command.group('command') in constants.COMMANDS_READY:
+        elif command.group('command') in constants.COMMANDS_TOGGLE:
             self._syncplayClient.toggleReady()
         else:
             if self._tryAdvancedCommands(data):
@@ -166,6 +166,7 @@ class ConsoleUI(threading.Thread):
             self.showMessage(getMessage("commandlist-notification/pause"), True)
             self.showMessage(getMessage("commandlist-notification/seek"), True)
             self.showMessage(getMessage("commandlist-notification/help"), True)
+            self.showMessage(getMessage("commandlist-notification/toggle"), True)
             self.showMessage(getMessage("commandlist-notification/create"), True)
             self.showMessage(getMessage("commandlist-notification/auth"), True)
             self.showMessage(getMessage("syncplay-version-notification").format(syncplay.version), True)