[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-4-27-g680f3aa

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit e61fa632972cf68a191632cbc77dfae26056fb27
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Mon May 21 22:41:22 2012 +0200

    Fix quarantine mail deletion for spanish users
    
    Fix quarantine mail deletion on web frontend for spanish users.
    
    Closes: #673833

diff --git a/debian/changelog b/debian/changelog
index da5c18b..892208b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ dspam (3.10.2+dfsg-1) unstable; urgency=low
     arch-specific contents (Closes: #669993).
   * Build-depend on debhelper (>= 9.0.0) to match compatibility.
   * Bump Standards-Version to 3.9.3 (no changes needed).
+  * Fix quarantine mails deletion in web frontend for spanish users
+    (Closes: #673833).
 
  -- Thomas Preud'homme <robotux at celest.fr>  Sun, 22 Apr 2012 17:46:10 +0200
 
diff --git a/debian/patches/007_process_quarantine_if_spanish.diff b/debian/patches/007_process_quarantine_if_spanish.diff
new file mode 100644
index 0000000..868ea6a
--- /dev/null
+++ b/debian/patches/007_process_quarantine_if_spanish.diff
@@ -0,0 +1,22 @@
+Description: Fix quarantine deletion in web frontend for spanish users
+ A string in dspam webfrontend is translated despite its value being used
+ in cgi scripts. This string should not be translated as it is not shown
+ to the user.
+Author: Daniel Vidal de la Rubia <dvrubia at gmail.com>
+Bug-Debian: http://bugs.debian.org/673833
+Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673833
+Forwarded: no
+Reviewed-By: Thomas Preud'homme <robotux at celest.fr>
+Last-Update: 2012-05-21
+
+--- dspam-3.10.2+dfsg.orig/webui/cgi-bin/templates/es-es/nav_quarantine.html
++++ dspam-3.10.2+dfsg/webui/cgi-bin/templates/es-es/nav_quarantine.html
+@@ -38,7 +38,7 @@ Marca los mensajes y luego usa las opcio
+ 
+ <form action="$CGI$" method="post">
+ <p>
+-<input type="hidden" name="command" value="processMensajes en cuarentena">
++<input type="hidden" name="command" value="processQuarantine">
+ <input type="hidden" name="template" value="quarantine">
+ <input type="hidden" name="user" value="$REMOTE_USER$">
+ <input type="hidden" name="sortby" value="$SORTBY$">
diff --git a/debian/patches/series b/debian/patches/series
index eafd58e..3648194 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 003_dspam-default.prefs-in_etc.diff
 005_dspam-notify.diff
 006_default-daemon-port.diff
+007_process_quarantine_if_spanish.diff

-- 
Debian packages for the DSPAM anti-spam filter