[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n/Views/Browser - Translate.py:1.2 browser.zcml:1.2 translate.pt:1.5

[Stephan Richter]

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

Modified Files:
	Translate.py browser.zcml translate.pt 
Log Message:
Check in some files I forgot to add earlier.

Made delete messages work.


=== Zope3/lib/python/Zope/I18n/Views/Browser/Translate.py 1.1 => 1.2 ===
             msg_id = self.request.get('new-msg_id-%i' %count, '')
             if msg_id:
-                domain = REQUEST.get('new-domain-%i' %count, 'default')
-                for language in self.getEditLanguages(self.request):
+                domain = self.request.get('new-domain-%i' %count, 'default')
+                for language in self.getEditLanguages():
                     msg = self.request.get('new-%s-%i' %(language, count),
                                            msg_id)
                     self.context.addMessage(domain, msg_id, msg, language)
@@ -87,7 +87,7 @@
         for key in keys:
             msg_id = self.request['edit-msg_id-'+key]
             domain = self.request['edit-domain-'+key]
-            for language in self.getEditLanguages(self.request):
+            for language in self.getEditLanguages():
                 msg = self.request['edit-%s-%s' %(language, key)]
                 if msg != self.context.translate(domain, msg_id,
                                                  target_language=language):
@@ -96,8 +96,17 @@
         return self.request.getResponse().redirect(self.request.URL[-1])
 
 
-    def deleteMessages(self):
+    def deleteMessages(self, message_ids):
         """ """
+        for id in message_ids:
+            domain = self.request.form['edit-domain-%s' %id]
+            msgid = self.request.form['edit-msg_id-%s' %id]
+            for language in self.context.getAvailableLanguages(domain):
+                # Some we edit a language, but no translation exists...
+                try:
+                    self.context.deleteMessage(domain, msgid, language)
+                except KeyError:
+                    pass
         return self.request.getResponse().redirect(self.request.URL[-1])
 
 


=== Zope3/lib/python/Zope/I18n/Views/Browser/browser.zcml 1.1 => 1.2 ===
      <browser:page name="editMessages.html" attribute="editMessages" />
 
+     <browser:page name="deleteMessages.html" attribute="deleteMessages" />
+
      <browser:page name="addLanguage.html" attribute="addLanguage" />
      <browser:page name="addDomain.html" attribute="addDomain" />
 


=== Zope3/lib/python/Zope/I18n/Views/Browser/translate.pt 1.4 => 1.5 ===
 	       tal:attributes="name python: 'edit-domain-%i' %message[2];
                                value python: message[1]">
-        <input type="checkbox" names="message_ids:list"
-	       tal:attributes="name python: message[2]">
+        <input type="checkbox" name="message_ids:list"
+	       tal:attributes="value python: message[2]">
       </td>
       <td>
         <a href="editMessage?messageId="