Commit 1db41e01 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

Dont try to guess system language

getdefaultlocale() is not a good way for determining the users configured language

Let the client figure it out and pass it to nbxmpp
parent 3952ae1d
......@@ -45,10 +45,7 @@ class NonBlockingBOSH(NonBlockingTransport):
idlequeue, estabilish_tls, certs, tls_version, cipher_list)
self.bosh_sid = None
if locale.getdefaultlocale()[0]:
self.bosh_xml_lang = locale.getdefaultlocale()[0].split('_')[0]
else:
self.bosh_xml_lang = 'en'
self.bosh_xml_lang = self._owner.lang
self.http_version = 'HTTP/1.1'
self.http_persistent = True
......
......@@ -42,7 +42,7 @@ class NonBlockingClient:
handling, whereas underlying modules take care of feature-specific logic
"""
def __init__(self, domain, idlequeue, caller=None):
def __init__(self, domain, idlequeue, caller=None, lang='en'):
"""
Caches connection data
......@@ -50,9 +50,11 @@ class NonBlockingClient:
:param idlequeue: processing idlequeue
:param caller: calling object - it has to implement methods
_event_dispatcher which is called from dispatcher instance
:param lang: the preferred stream language
"""
self.Namespace = protocol.NS_CLIENT
self.defaultNamespace = self.Namespace
self.lang = lang
self.idlequeue = idlequeue
self.disconnect_handlers = []
......
......@@ -239,9 +239,7 @@ class XMPPDispatcher(PlugIn):
self._metastream.setAttr('version', '1.0')
self._metastream.setAttr('xmlns:stream', NS_STREAMS)
self._metastream.setAttr('to', self._owner.Server)
if locale.getdefaultlocale()[0]:
self._metastream.setAttr('xml:lang',
locale.getdefaultlocale()[0].split('_')[0])
self._metastream.setAttr('xml:lang', self._owner.lang)
self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2]))
def _check_stream_start(self, ns, tag, attrs):
......@@ -703,9 +701,7 @@ class BOSHDispatcher(XMPPDispatcher):
self._metastream.setAttr('version', '1.0')
self._metastream.setAttr('xmlns:stream', NS_STREAMS)
self._metastream.setAttr('to', self._owner.Server)
if locale.getdefaultlocale()[0]:
self._metastream.setAttr('xml:lang',
locale.getdefaultlocale()[0].split('_')[0])
self._metastream.setAttr('xml:lang', self._owner.lang)
self.restart = True
self._owner.Connection.send_init(after_SASL=self.after_SASL)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment