From 0a197cab888ee119891e193bdf65854127277831 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 10 Jul 2016 12:26:13 +0200 Subject: [PATCH] quick_frontend, primitivus: moved main_message property to quick_frontend --- frontends/src/primitivus/chat.py | 19 +++---------------- frontends/src/quick_frontend/quick_chat.py | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py index 0a876213..21884ba8 100644 --- a/frontends/src/primitivus/chat.py +++ b/frontends/src/primitivus/chat.py @@ -65,20 +65,7 @@ class MessageWidget(urwid.WidgetWrap): @property def message(self): """Return currently displayed message""" - message = self.mess_data.message - if self.parent.lang in message: - self.selected_lang = self.parent.lang - return message[self.parent.lang] - try: - self.selected_lang = '' - return message[''] - except KeyError: - try: - lang, mess = message.iteritems().next() - self.selected_lang = lang - return mess - except StopIteration: - log.error(u"Can't find message for uid {}".format(self.mess_data.uid)) + return self.mess_data.main_message @message.setter def message(self, value): @@ -139,8 +126,8 @@ class MessageWidget(urwid.WidgetWrap): msg = self.message # needed to generate self.selected_lang - if self.selected_lang: - markup.append(("msg_lang", u"[{}] ".format(self.selected_lang))) + if d.selected_lang: + markup.append(("msg_lang", u"[{}] ".format(d.selected_lang))) # message body markup.append(msg) diff --git a/frontends/src/quick_frontend/quick_chat.py b/frontends/src/quick_frontend/quick_chat.py index d4c79e11..f299bfa4 100644 --- a/frontends/src/quick_frontend/quick_chat.py +++ b/frontends/src/quick_frontend/quick_chat.py @@ -80,6 +80,23 @@ class Message(object): except AttributeError: return False + @property + def main_message(self): + """Return currently displayed message""" + if self.parent.lang in self.message: + self.selected_lang = self.parent.lang + return self.message[self.parent.lang] + try: + self.selected_lang = '' + return self.message[''] + except KeyError: + try: + lang, mess = self.message.iteritems().next() + self.selected_lang = lang + return mess + except StopIteration: + log.error(u"Can't find message for uid {}".format(self.mess_data.uid)) + def getNick(self, entity): """Return nick of an entity when possible""" contact_list = self.host.contact_lists[self.profile]