From 96d1c26f90ce0ecd3651a9990e72e7d55e298328 Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 30 Sep 2016 21:01:05 +0200 Subject: Add a fallback if the lang we want is not available Previously, trying to get a text node with a lang which is different from the one we specified would return nothing, which means e.g. a message would be ignored because its body is of lang 'fr' when we setup slixmpp to prefer 'en'. We want to return something when there is an available, valid content in a different language. --- slixmpp/xmlstream/stanzabase.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/slixmpp/xmlstream/stanzabase.py b/slixmpp/xmlstream/stanzabase.py index 8023831b..e7ffddc8 100644 --- a/slixmpp/xmlstream/stanzabase.py +++ b/slixmpp/xmlstream/stanzabase.py @@ -907,11 +907,17 @@ class ElementBase(object): stanzas = self.xml.findall(name) if not stanzas: return default + result = None for stanza in stanzas: if stanza.attrib.get('{%s}lang' % XML_NS, default_lang) == lang: if stanza.text is None: return default - return stanza.text + result = stanza.text + break + if stanza.text: + result = stanza.text + if result is not None: + return result return default def _get_all_sub_text(self, name, default='', lang=None): -- cgit v1.2.3