[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - Negotiator.py:1.1.2.4.14.1

Jim Fulton jim@zope.com
Wed, 29 May 2002 11:10:22 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/I18n
In directory cvs.zope.org:/tmp/cvs-serv12181/lib/python/Zope/I18n

Modified Files:
      Tag: Zope3InWonderland-branch
	Negotiator.py 
Log Message:
- Added permission_id attribute to adapter and utility directives.

- Got rid of old getView, getResource, and getDefaultViewName.
  Renamed getRequestView to getView (and so on).

  Changed view interface to use context, rather than getContext.

  Introduced notion of presentation types (e.g. IBrowserPresentation, 
  which is cleaner than IBrowserPublisher).

- Began converting to get/queryFoo, which is much nicer.

- Many formatting fixups.



=== Zope3/lib/python/Zope/I18n/Negotiator.py 1.1.2.4 => 1.1.2.4.14.1 ===
 # 
 ##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.I18n.INegotiator import INegotiator
-from Zope.I18n.IUserPreferedLanguages import IUserPreferedLanguages
-from Zope.ComponentArchitecture import getAdapter
-
-class Negotiator:
-
-    __implements__ = INegotiator
-
-    def getLanguage(self, object_langs, env):
-
-        adapter  = getAdapter(env, IUserPreferedLanguages)
-        user_langs = adapter.getLanguages()
-
-        for lang in user_langs:
-            if lang in object_langs:
-                return lang
-
-        return None
-
-
-negotiator = Negotiator()
+"""
+
+$Id$
+"""
+
+from Zope.I18n.INegotiator import INegotiator
+from Zope.I18n.IUserPreferedLanguages import IUserPreferedLanguages
+from Zope.ComponentArchitecture import getAdapter
+
+class Negotiator:
+
+    __implements__ = INegotiator
+
+    def getLanguage(self, object_langs, env):
+
+        adapter  = getAdapter(env, IUserPreferedLanguages)
+        user_langs = adapter.getLanguages()
+
+        for lang in user_langs:
+            if lang in object_langs:
+                return lang
+
+        return None
+
+
+negotiator = Negotiator()
+