# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1498562860 -7200
# Node ID e9069169691981a404fdc1be2a60dd807f17d1b5
# Parent  65e4710b699f4b3d46aeb46917e7f0752c7acd71
Added exception check against missing request's annotations

diff -r 65e4710b699f -r e90691696919 src/pyams_i18n/negotiator.py
--- a/src/pyams_i18n/negotiator.py	Tue Jun 27 13:26:10 2017 +0200
+++ b/src/pyams_i18n/negotiator.py	Tue Jun 27 13:27:40 2017 +0200
@@ -55,6 +55,8 @@
                     try:
                         cached = request.annotations[LANGUAGE_CACHE_KEY]
                         return cached
+                    except AttributeError:
+                        return self.server_language
                     except KeyError:
                         session = request.session
                         lang = session.get('language')