hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-25 18:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix header name for browser languages

Browse Source
This commit is contained in:
Sarah Hoffmann
2023-06-20 11:09:44 +02:00
parent d0a1e8e311
commit 36df56b093
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/api/v1/server_glue.py
View File

@@ -185,7 +185,7 @@ class ASGIAdaptor(abc.ABC):
""" Return the accepted languages. """ Return the accepted languages.
""" """
return self.get('accept-language')\ return self.get('accept-language')\
or self.get_header('http_accept_language')\ or self.get_header('accept-language')\
or self.config().DEFAULT_LANGUAGE or self.config().DEFAULT_LANGUAGE

10
test/python/api/test_server_glue_v1.py
View File

@@ -123,7 +123,7 @@ def test_accepted_languages_from_param():
def test_accepted_languages_from_header(): def test_accepted_languages_from_header():
a = FakeAdaptor(headers={'http_accept_language': 'de'}) a = FakeAdaptor(headers={'accept-language': 'de'})
assert a.get_accepted_languages() == 'de' assert a.get_accepted_languages() == 'de'
@@ -135,13 +135,13 @@ def test_accepted_languages_from_default(monkeypatch):
def test_accepted_languages_param_over_header(): def test_accepted_languages_param_over_header():
a = FakeAdaptor(params={'accept-language': 'de'}, a = FakeAdaptor(params={'accept-language': 'de'},
headers={'http_accept_language': 'en'}) headers={'accept-language': 'en'})
assert a.get_accepted_languages() == 'de' assert a.get_accepted_languages() == 'de'
def test_accepted_languages_header_over_default(monkeypatch): def test_accepted_languages_header_over_default(monkeypatch):
monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'en') monkeypatch.setenv('NOMINATIM_DEFAULT_LANGUAGE', 'en')
a = FakeAdaptor(headers={'http_accept_language': 'de'}) a = FakeAdaptor(headers={'accept-language': 'de'})
assert a.get_accepted_languages() == 'de' assert a.get_accepted_languages() == 'de'
@@ -197,14 +197,14 @@ def test_raise_error_during_debug():
loglib.log().section('Ongoing') loglib.log().section('Ongoing')
with pytest.raises(FakeError) as excinfo: with pytest.raises(FakeError) as excinfo:
a.raise_error('bad state') a.raise_error('badstate')
content = ET.fromstring(excinfo.value.msg) content = ET.fromstring(excinfo.value.msg)
assert content.tag == 'html' assert content.tag == 'html'
assert '>Ongoing<' in excinfo.value.msg assert '>Ongoing<' in excinfo.value.msg
assert 'bad state' in excinfo.value.msg assert 'badstate' in excinfo.value.msg
# ASGIAdaptor.build_response # ASGIAdaptor.build_response