quick_frontend, primitivus: moved main_message property to quick_frontend
This commit is contained in:
parent
79f1179723
commit
0a197cab88
2 changed files with 20 additions and 16 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
Loading…
Reference in a new issue