[Zope3-checkins] CVS: Zope3/src/zope/i18n - interfaces.py:1.11 negotiator.py:1.4

[Marius Gedminas]

Update of /cvs-repository/Zope3/src/zope/i18n
In directory cvs.zope.org:/tmp/cvs-serv24834/src/zope/i18n

Modified Files:
	interfaces.py negotiator.py 
Log Message:
Change 'adaptor' to 'adapter', clean up some whitespace in the vicinity.


=== Zope3/src/zope/i18n/interfaces.py 1.10 => 1.11 ===
--- Zope3/src/zope/i18n/interfaces.py:1.10	Fri Mar 28 19:06:25 2003
+++ Zope3/src/zope/i18n/interfaces.py	Fri Apr 11 08:47:42 2003
@@ -229,7 +229,7 @@
         """
 
         # XXX I'd like for there to be a symmetric interface method, one in
-        # which an adaptor is gotten for both the first arg and the second
+        # which an adapter is gotten for both the first arg and the second
         # arg.  I.e. getLanguage(obj, env)
         # But this isn't a good match for the ITranslationService.translate()
         # method. :(
@@ -388,7 +388,7 @@
 
     dateTimePattern = Dict(title=u"Date-Time Pattern",
                            value_types=(TextLine(title=u"Pattern"),))
- 
+
     def update(other):
         """Update this calendar using data from other. Assume that unless
         other's data is not present, other has always more specific


=== Zope3/src/zope/i18n/negotiator.py 1.3 => 1.4 ===
--- Zope3/src/zope/i18n/negotiator.py:1.3	Mon Dec 30 21:52:13 2002
+++ Zope3/src/zope/i18n/negotiator.py	Fri Apr 11 08:47:42 2003
@@ -26,8 +26,8 @@
     __implements__ = INegotiator
 
     def getLanguage(self, langs, env):
-        envadaptor = getAdapter(env, IUserPreferredLanguages)
-        userlangs = envadaptor.getPreferredLanguages()
+        envadapter = getAdapter(env, IUserPreferredLanguages)
+        userlangs = envadapter.getPreferredLanguages()
         # Prioritize on the user preferred languages.  Return the first user
         # preferred language that the object has available.
         for lang in userlangs: