[Erp5-report] r8008 - /spec/mandriva/2006.0/zope-Localizer/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jun 19 17:39:04 2006
New Revision: 8008

URL: http://svn.erp5.org?rev=8008&view=rev
Log:
Commit zope-Localizer-1.1.0-7mdk spec files and patches

Added:
    spec/mandriva/2006.0/zope-Localizer/Localizer-1.1.0-lang_negotiator.patch
Modified:
    spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec

Added: spec/mandriva/2006.0/zope-Localizer/Localizer-1.1.0-lang_negotiator.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-Localizer/Localizer-1.1.0-lang_negotiator.patch?rev=8008&view=auto
==============================================================================
--- spec/mandriva/2006.0/zope-Localizer/Localizer-1.1.0-lang_negotiator.patch (added)
+++ spec/mandriva/2006.0/zope-Localizer/Localizer-1.1.0-lang_negotiator.patch Mon Jun 19 17:39:04 2006
@@ -1,0 +1,33 @@
+--- Localizer-1.1.0.orig/Localizer/Utils.py	2005-04-10 18:57:40.000000000 +0200
++++ Localizer-1.1.0/Localizer/Utils.py	2006-03-21 14:37:58.788386021 +0100
+@@ -40,15 +40,18 @@
+     language that is available, if none is available returns None.
+     """
+     context = get_context()
+-    request, response = context.request, context.response
++    try:
++        request, response = context.request, context.response
+ 
+-    lang = request.accept_language.select_language(available_languages)
++        lang = request.accept_language.select_language(available_languages)
+ 
+-    # XXX Here we should set the Vary header, but, which value should it have??
+-##    response.set_header('Vary', 'accept-language')
+-##    response.set_header('Vary', '*')
++        # XXX Here we should set the Vary header, but, which value should it have??
++##        response.set_header('Vary', 'accept-language')
++##        response.set_header('Vary', '*')
+ 
+-    return lang
++        return lang
++    except AttributeError:
++        return None
+ 
+ 
+ # Defines strings that must be internationalized
+Common subdirectories: Localizer-1.1.0.orig/help and Localizer-1.1.0/help
+Common subdirectories: Localizer-1.1.0.orig/img and Localizer-1.1.0/img
+Common subdirectories: Localizer-1.1.0.orig/locale and Localizer-1.1.0/locale
+Common subdirectories: Localizer-1.1.0.orig/old and Localizer-1.1.0/old
+Common subdirectories: Localizer-1.1.0.orig/tests and Localizer-1.1.0/tests
+Common subdirectories: Localizer-1.1.0.orig/ui and Localizer-1.1.0/ui

Modified: spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec?rev=8008&r1=8007&r2=8008&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec (original)
+++ spec/mandriva/2006.0/zope-Localizer/zope-Localizer.spec Mon Jun 19 17:39:04 2006
@@ -1,6 +1,6 @@
 %define product   Localizer
 %define version   1.1.0
-%define release   6
+%define release   7
 
 %define zope_minver 2.7
 
@@ -16,6 +16,7 @@
 Source:    %{product}-%{version}.tar.bz2
 Patch0:    Localizer-1.1.0-compat.patch.bz2
 Patch1:    Localizer-1.1.0-string_import.patch.bz2
+Patch2:    Localizer-1.1.0-lang_negotiator.patch.bz2
 URL:       http://www.ikaaro.org/localizer/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-rootdir
 BuildArch: noarch
@@ -34,6 +35,7 @@
 %setup -c
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # Not much, eh? :-)
@@ -64,6 +66,9 @@
 
 #----------------------------------------------------------------------
 %changelog
+* Tue Mar 21 2006 Yoshinori Okuji <yo at nexedi.com> 1.1.0-7mdk
+- Patch lang_negotiator so that it returns None when context is not available
+
 * Wed Feb 01 2006 Kevin Deldycke <kevin at nexedi.com> 1.1.0-6mdk
 - Give ownership to zope