Merge branch 'release/0.4.1'

* release/0.4.1:
  bump version number
  fix language check when no Accept-Language header is set
This commit is contained in:
Jan Dittberner 2015-02-20 23:03:59 +01:00
commit 2a05499035
4 changed files with 13 additions and 8 deletions

View file

@ -1,5 +1,6 @@
2015-02-20 Jan Dittberner <jan@dittberner.info> 2015-02-20 Jan Dittberner <jan@dittberner.info>
* add Jessie requirements file * add Jessie requirements file
* fix language check if no Accept-Language header is sent
2014-10-14 Jan Dittberner <jan@dittberner.info> 2014-10-14 Jan Dittberner <jan@dittberner.info>
* add patch by Paul Wise to use to update DUCK link to new static page * add patch by Paul Wise to use to update DUCK link to new static page

View file

@ -39,11 +39,15 @@ class BaseController(WSGIController):
# the request is routed to. This routing information is # the request is routed to. This routing information is
# available in environ['pylons.routes_dict'] # available in environ['pylons.routes_dict']
# set language environment # set language environment
for lang in request.languages: try:
languages = request.languages
for lang in languages:
try: try:
add_fallback(lang.replace('-', '_')) add_fallback(lang.replace('-', '_'))
except: except:
pass pass
except:
pass
c.messages = {'errors': [], 'messages': []} c.messages = {'errors': [], 'messages': []}
return WSGIController.__call__(self, environ, start_response) return WSGIController.__call__(self, environ, start_response)

View file

@ -53,7 +53,7 @@ copyright = u'2009-2015, Jan Dittberner'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.4.0' version = '0.4.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version

View file

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Debian Member Portfolio Service setup # Debian Member Portfolio Service setup
# Copyright © 2009-2014 Jan Dittberner <jan@dittberner.info> # Copyright © 2009-2015 Jan Dittberner <jan@dittberner.info>
# #
# This file is part of the Debian Member Portfolio Service. # This file is part of the Debian Member Portfolio Service.
# #
@ -28,7 +28,7 @@ except ImportError:
setup( setup(
name='debianmemberportfolio', name='debianmemberportfolio',
version='0.4.0', version='0.4.1',
description='service to create Debian Member Portfolio URLs', description='service to create Debian Member Portfolio URLs',
long_description="""This is a service implementation that returns a set of long_description="""This is a service implementation that returns a set of
personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It personalized URLs as outlined in https://wiki.debian.org/DDPortfolio. It