From aaf332b74cd71b4dca3eb21c311296d8325aca78 Mon Sep 17 00:00:00 2001 From: Etoh Date: Tue, 26 Feb 2019 22:21:01 +0000 Subject: [PATCH] Refactor: Avoid complicate your/their file/stream concatenation --- syncplay/messages.py | 4 ++-- syncplay/messages_de.py | 12 ++++++------ syncplay/messages_en.py | 12 ++++++------ syncplay/messages_it.py | 12 ++++++------ syncplay/messages_ru.py | 8 ++++---- syncplay/ui/gui.py | 20 +++++++++++++------- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/syncplay/messages.py b/syncplay/messages.py index 4142cbb..f2c4657 100755 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -75,5 +75,5 @@ def getMessage(type_, locale=None): return str(messages["en"][type_]) else: print("WARNING: Cannot find message '{}'!".format(type_)) - return "!{}".format(type_) # TODO: Remove - # raise KeyError(type_) + #return "!{}".format(type_) # TODO: Remove + raise KeyError(type_) diff --git a/syncplay/messages_de.py b/syncplay/messages_de.py index c2ef7cf..a5b762f 100755 --- a/syncplay/messages_de.py +++ b/syncplay/messages_de.py @@ -484,12 +484,12 @@ de = { "editplaylist-menu-label": "Edit playlist", "open-containing-folder": "Open folder containing this file", - "addusersfiletoplaylist-menu-label": "Add {} file to playlist", # item owner indicator - "addusersstreamstoplaylist-menu-label": "Add {} stream to playlist", # item owner indicator - "openusersstream-menu-label": "Open {} stream", # [username]'s - "openusersfile-menu-label": "Open {} file", # [username]'s - "item-is-yours-indicator": "your", # Goes with addusersfiletoplaylist/addusersstreamstoplaylist - "item-is-others-indicator": "{}'s", # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist + "addyourfiletoplaylist-menu-label": "Add your file to playlist", + "addotherusersfiletoplaylist-menu-label": "Add {}'s file to playlist", # [Username] + "addyourstreamstoplaylist-menu-label": "Add your stream to playlist", + "addotherusersstreamstoplaylist-menu-label": "Add {}' stream to playlist", # [Username] + "openusersstream-menu-label": "Open {}'s stream", # [username]'s + "openusersfile-menu-label": "Open {}'s file", # [username]'s "playlist-instruction-item-message": "Drag file here to add it to the shared playlist.", "sharedplaylistenabled-tooltip": "Room operators can add files to a synced playlist to make it easy for everyone to watching the same thing. Configure media directories under 'Misc'.", diff --git a/syncplay/messages_en.py b/syncplay/messages_en.py index c135fc1..1fd0d04 100755 --- a/syncplay/messages_en.py +++ b/syncplay/messages_en.py @@ -484,12 +484,12 @@ en = { "editplaylist-menu-label": "Edit playlist", "open-containing-folder": "Open folder containing this file", - "addusersfiletoplaylist-menu-label": "Add {} file to playlist", # item owner indicator - "addusersstreamstoplaylist-menu-label": "Add {} stream to playlist", # item owner indicator - "openusersstream-menu-label": "Open {} stream", # [username]'s - "openusersfile-menu-label": "Open {} file", # [username]'s - "item-is-yours-indicator": "your", # Goes with addusersfiletoplaylist/addusersstreamstoplaylist - "item-is-others-indicator": "{}'s", # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist + "addyourfiletoplaylist-menu-label": "Add your file to playlist", + "addotherusersfiletoplaylist-menu-label": "Add {}'s file to playlist", # [Username] + "addyourstreamstoplaylist-menu-label": "Add your stream to playlist", + "addotherusersstreamstoplaylist-menu-label": "Add {}' stream to playlist", # [Username] + "openusersstream-menu-label": "Open {}'s stream", # [username]'s + "openusersfile-menu-label": "Open {}'s file", # [username]'s "playlist-instruction-item-message": "Drag file here to add it to the shared playlist.", "sharedplaylistenabled-tooltip": "Room operators can add files to a synced playlist to make it easy for everyone to watching the same thing. Configure media directories under 'Misc'.", diff --git a/syncplay/messages_it.py b/syncplay/messages_it.py index c6098f2..b308c88 100755 --- a/syncplay/messages_it.py +++ b/syncplay/messages_it.py @@ -484,12 +484,12 @@ it = { "editplaylist-menu-label": "Modifica la playlist", "open-containing-folder": "Apri la cartella contenente questo file", - "addusersfiletoplaylist-menu-label": "Aggiungi il file {} alla playlist", # item owner indicator # TODO needs testing - "addusersstreamstoplaylist-menu-label": "Aggiungi l'indirizzo {} alla playlist", # item owner indicator # TODO needs testing - "openusersstream-menu-label": "Apri l'indirizzo di {}", # [username]'s - "openusersfile-menu-label": "Apri il file di {}", # [username]'s - "item-is-yours-indicator": "tuo", # Goes with addusersfiletoplaylist/addusersstreamstoplaylist # TODO needs testing - "item-is-others-indicator": "di {}", # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist # TODO needs testing + "addyourfiletoplaylist-menu-label": "Aggiungi il file tuo alla playlist", # TODO needs testing + "addotherusersfiletoplaylist-menu-label": "Aggiungi il file di {} alla playlist", # Username # TODO needs testing + "addyourstreamstoplaylist-menu-label": "Aggiungi l'indirizzo tuo alla playlist", # TODO needs testing + "addotherusersstreamstoplaylist-menu-label": "Aggiungi l'indirizzo di {} alla playlist", # Username # item owner indicator # TODO needs testing + "openusersstream-menu-label": "Apri l'indirizzo di {}", # [username] # TODO needs testing + "openusersfile-menu-label": "Apri il file di {}", # [username]'s # TODO needs testing "playlist-instruction-item-message": "Trascina qui i file per aggiungerli alla playlist condivisa.", "sharedplaylistenabled-tooltip": "Gli operatori della stanza possono aggiungere i file a una playlist sincronizzata per garantire che tutti i partecipanti stiano guardando la stessa cosa. Configura le cartelle multimediali alla voce 'Miscellanea'.", diff --git a/syncplay/messages_ru.py b/syncplay/messages_ru.py index 62d1517..bd1abe7 100755 --- a/syncplay/messages_ru.py +++ b/syncplay/messages_ru.py @@ -484,12 +484,12 @@ ru = { "editplaylist-menu-label": "Редактировать список", "open-containing-folder": "Open folder containing this file", # TODO: Traslate - "addusersfiletoplaylist-menu-label": "Добавить файл {} в список воспроизведения", # item owner indicator - "addusersstreamstoplaylist-menu-label": "Добавить поток {} в список воспроизведения", # item owner indicator + "addyourfiletoplaylist-menu-label": "Добавить файл от вас в список воспроизведения", # TODO: Check + "addotherusersfiletoplaylist-menu-label": "Добавить файл {} в список воспроизведения", # Username # TODO: Check + "addyourstreamstoplaylist-menu-label": "Добавить поток от вас в список воспроизведения", # TODO: Check + "addotherusersstreamstoplaylist-menu-label": "Добавить поток {} в список воспроизведения", # Username # TODO: Check "openusersstream-menu-label": "Открыть поток от {}", # [username]'s "openusersfile-menu-label": "Открыть файл от {}", # [username]'s - "item-is-yours-indicator": "от вас", # Goes with addusersfiletoplaylist/addusersstreamstoplaylist - "item-is-others-indicator": "{}", # username - goes with addusersfiletoplaylist/addusersstreamstoplaylist "playlist-instruction-item-message": "Перетащите сюда файлы, чтобы добавить их в общий список.", "sharedplaylistenabled-tooltip": "Оператор комнаты может добавлять файлы в список общего воспроизведения для удобного совместного просмотра. Папки воспроизведения настраиваются во вкладке 'Файл'.", diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index a50ca16..7776bac 100755 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -699,12 +699,18 @@ class MainWindow(QtWidgets.QMainWindow): menu = QtWidgets.QMenu() username = item.sibling(item.row(), 0).data() - if username == self._syncplayClient.userlist.currentUser.username: - shortUsername = getMessage("item-is-yours-indicator") - elif len(username) < 15: - shortUsername = getMessage("item-is-others-indicator").format(username) + + if len(username) < 15: + shortUsername = username else: - shortUsername = "{}...".format(getMessage("item-is-others-indicator").format(username[0:12])) # TODO: Enforce username limits in client and server + shortUsername = "{}...".format(username[0:12]) + + if username == self._syncplayClient.userlist.currentUser.username: + addUsersFileToPlaylistLabelText = getMessage("addyourfiletoplaylist-menu-label") + addUsersStreamToPlaylistLabelText = getMessage("addyourstreamstoplaylist-menu-label") + else: + addUsersFileToPlaylistLabelText = getMessage("addotherusersfiletoplaylist-menu-label").format(shortUsername) + addUsersStreamToPlaylistLabelText = getMessage("addotherusersstreamstoplaylist-menu-label").format(shortUsername) filename = item.sibling(item.row(), 3).data() while item.parent().row() != -1: @@ -715,9 +721,9 @@ class MainWindow(QtWidgets.QMainWindow): elif username and filename and filename != getMessage("nofile-note"): if self.config['sharedPlaylistEnabled'] and not self.isItemInPlaylist(filename): if isURL(filename): - menu.addAction(QtGui.QPixmap(resourcespath + "world_add.png"), getMessage("addusersstreamstoplaylist-menu-label").format(shortUsername), lambda: self.addStreamToPlaylist(filename)) + menu.addAction(QtGui.QPixmap(resourcespath + "world_add.png"), addUsersStreamToPlaylistLabelText, lambda: self.addStreamToPlaylist(filename)) else: - menu.addAction(QtGui.QPixmap(resourcespath + "film_add.png"), getMessage("addusersfiletoplaylist-menu-label").format(shortUsername), lambda: self.addStreamToPlaylist(filename)) + menu.addAction(QtGui.QPixmap(resourcespath + "film_add.png"), addUsersFileToPlaylistLabelText, lambda: self.addStreamToPlaylist(filename)) if self._syncplayClient.userlist.currentUser.file is None or filename != self._syncplayClient.userlist.currentUser.file["name"]: if isURL(filename):