From afe5828b166e272d1923017fd8c46e435bb285ec Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 20 Feb 2015 23:01:34 +0100 Subject: [PATCH 1/2] fix language check when no Accept-Language header is set --- ChangeLog | 1 + debianmemberportfolio/lib/base.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc8b392..77dfb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2015-02-20 Jan Dittberner * add Jessie requirements file + * fix language check if no Accept-Language header is sent 2014-10-14 Jan Dittberner * add patch by Paul Wise to use to update DUCK link to new static page diff --git a/debianmemberportfolio/lib/base.py b/debianmemberportfolio/lib/base.py index da057f4..7746e92 100644 --- a/debianmemberportfolio/lib/base.py +++ b/debianmemberportfolio/lib/base.py @@ -39,11 +39,15 @@ class BaseController(WSGIController): # the request is routed to. This routing information is # available in environ['pylons.routes_dict'] # set language environment - for lang in request.languages: - try: - add_fallback(lang.replace('-', '_')) - except: - pass + try: + languages = request.languages + for lang in languages: + try: + add_fallback(lang.replace('-', '_')) + except: + pass + except: + pass c.messages = {'errors': [], 'messages': []} return WSGIController.__call__(self, environ, start_response) From ca8e6e19e28017af55959386a795b4d7ada5bf55 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Fri, 20 Feb 2015 23:03:42 +0100 Subject: [PATCH 2/2] bump version number --- docs/source/conf.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 3096b10..0e7d024 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -53,7 +53,7 @@ copyright = u'2009-2015, Jan Dittberner' # built documents. # # The short X.Y version. -version = '0.4.0' +version = '0.4.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index f47390c..29adbf9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Debian Member Portfolio Service setup -# Copyright © 2009-2014 Jan Dittberner +# Copyright © 2009-2015 Jan Dittberner # # This file is part of the Debian Member Portfolio Service. # @@ -28,7 +28,7 @@ except ImportError: setup( name='debianmemberportfolio', - version='0.4.0', + version='0.4.1', description='service to create Debian Member Portfolio URLs', long_description="""This is a service implementation that returns a set of personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It