[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18n Merged from trunk:

[Jim Fulton]

Log message for revision 26224:
Merged from trunk:

  r26173 | jim | 2004-07-07 14:09:24 -0400 (Wed, 07 Jul 2004) | 2 lines
  r26174 | jim | 2004-07-07 14:22:07 -0400 (Wed, 07 Jul 2004) | 2 lines

Resolved an XXX by quoting part of a url.




-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py	2004-07-08 19:40:41 UTC (rev 26223)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nfile.py	2004-07-08 19:42:22 UTC (rev 26224)
@@ -15,6 +15,8 @@
 
 $Id$
 """
+
+from urllib import quote
 from zope.i18n.negotiator import negotiator
 from zope.app.i18n import ZopeMessageIDFactory as _
 
@@ -61,4 +63,4 @@
             self.context.setData(data, language)
             self.context.contentType = contentType
         return self.request.response.redirect(self.request.URL[-1] +
-                      "/editForm.html?language=%s" %language)  # XXX url_quote
+                      "/editForm.html?language=%s" % quote(language, ''))

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nimage.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nimage.py	2004-07-08 19:40:41 UTC (rev 26223)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18nfile/browser/i18nimage.py	2004-07-08 19:42:22 UTC (rev 26224)
@@ -19,8 +19,8 @@
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.file.browser.image import ImageData
 from zope.app.size import byteDisplay
+from urllib import quote
 
-
 class I18nImageEdit(object):
 
     name = 'editForm'
@@ -54,9 +54,9 @@
             self.context.setData(data, language)
             self.context.contentType = contentType
         return self.request.response.redirect(self.request.URL[-1] +
-                      "/upload.html?language=%s" % language)  # XXX url_quote
+                      "/upload.html?language=%s" % quote(language, ''))
 
-
+    
 class I18nImageData(ImageData):
 
     def __call__(self):