First round integration of Juan Carlos's translatable string markings.

4 files changed, 24 insertions, 17 deletions

diff --git a/Mailman/Handlers/Acknowledge.py b/Mailman/Handlers/Acknowledge.py
index 5617629d1..8ad2ab709 100644
--- a/Mailman/Handlers/Acknowledge.py
+++ b/Mailman/Handlers/Acknowledge.py
@@ -41,15 +41,16 @@ def process(mlist, msg, msgdata):
             if len(subject) > plen and subject[0:plen] == prefix:
                    subject = subject[plen:]
         # get the text from the template
+        realname = mlist.real_name
         text = Utils.maketext(
             'postack.txt',
             {'subject'     : subject,
-             'listname'    : mlist.real_name,
+             'listname'    : realname,
              'listinfo_url': mlist.GetScriptURL('listinfo', absolute=1),
              })
         # craft the outgoing message, with all headers and attributes
         # necessary for general delivery
-        subject = '%s post acknowledgement' % mlist.real_name
+        subject = _('%(realname)s post acknowledgement')
         msg = Message.UserNotification(sender, mlist.GetAdminEmail(),
                                        subject, text)
         HandlerAPI.DeliverToUser(mlist, msg)
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 8bd66fbcd..e51a82dde 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -47,7 +47,7 @@ def process(mlist, msg, msgdata):
         prefix = mlist.subject_prefix
         # we purposefully leave no space b/w prefix and subject!
         if not subject:
-            msg['Subject'] = prefix + '(no subject)'
+            msg['Subject'] = prefix + _('(no subject)')
         elif prefix and not re.search(re.escape(prefix), subject, re.I):
             msg['Subject'] = prefix + subject
     #
diff --git a/Mailman/Handlers/HandlerAPI.py b/Mailman/Handlers/HandlerAPI.py
index ca455a281..09eaeb705 100644
--- a/Mailman/Handlers/HandlerAPI.py
+++ b/Mailman/Handlers/HandlerAPI.py
@@ -24,6 +24,7 @@ from Mailman import mm_cfg
 from Mailman import Errors
 from Mailman.Logging.Syslog import syslog
 from Mailman.pythonlib.StringIO import StringIO
+from Mailman.i18n import _
 
 
 
@@ -37,7 +38,7 @@ class MessageHeld(HandlerError):
     def __str__(self):
         return self.__class__.__doc__
 
-    rejection = 'Your message was rejected'
+    rejection = _('Your message was rejected')
 
     def rejection_notice(self, mlist):
         return self.__class__.rejection
diff --git a/Mailman/Handlers/ToDigest.py b/Mailman/Handlers/ToDigest.py
index ec39d6aa0..bfdde1af7 100644
--- a/Mailman/Handlers/ToDigest.py
+++ b/Mailman/Handlers/ToDigest.py
@@ -206,11 +206,12 @@ class Digest:
 
     def ComposeBaseHeaders(self, msg):
         """Populate the message with the presentation-independent headers."""
-        mlist = self.__mlist
-	msg['From'] = mlist.GetRequestEmail()
-	msg['Subject'] = ('%s digest, %s - %s' % 
-                          (mlist.real_name, self.__volume, self.__numinfo))
-	msg['Reply-to'] = mlist.GetListEmail()
+        realname = self.__mlist.real_name
+        volume = self.__volume
+        numinfo = self.__numinfo
+	msg['From'] = self.__mlist.GetRequestEmail()
+	msg['Subject'] = _('%(realname)s digest, %(volume)s - %(numinfo)s')
+	msg['Reply-to'] = self.__mlist.GetListEmail()
         msg['X-Mailer'] = "Mailman v%s" % mm_cfg.VERSION
         msg['MIME-version'] = '1.0'
 
@@ -261,10 +262,12 @@ class Digest:
         lines = []
         # Masthead:
         if mime:
+            realname = self.__mlist.real_name
+            volume = self.__volume
             lines.append(dashbound)
             lines.append("Content-type: text/plain; charset=us-ascii")
-            lines.append("Content-description: Masthead (%s digest, %s)"
-                         % (self.__mlist.real_name, self.__volume))
+            lines.append("Content-description:" +
+                         _(" Masthead (%(realname)s digest, %(volume)s)"))
             lines.append('')
         masthead = Utils.maketext('masthead.txt', self.TemplateRefs())
         lines = lines + string.split(masthead, '\n')
@@ -274,18 +277,19 @@ class Digest:
             if mime:
                 lines.append(dashbound)
                 lines.append("Content-type: text/plain; charset=us-ascii")
-                lines.append("Content-description: Digest Header")
+                lines.append("Content-description: " + _("Digest Header"))
                 lines.append('')
             lines.append(self.__mlist.digest_header % self.TemplateRefs())
         # Table of contents:
         lines.append('')
         if mime:
+            numinfo = self.__numinfo
             lines.append(dashbound)
             lines.append("Content-type: text/plain; charset=us-ascii")
-            lines.append("Content-description: Today's Topics (%s)" %
-                         self.__numinfo)
+            lines.append("Content-description: " +
+                         _("Today's Topics (%(numinfo)s)"))
             lines.append('')
-        lines.append("Today's Topics:")
+        lines.append(_("Today's Topics:"))
         lines.append('')
         lines.append(self.__toc)
         # Digest text:
@@ -308,7 +312,7 @@ class Digest:
             lines.append(dashbound)
             if mime:
                 lines.append("Content-type: text/plain; charset=us-ascii")
-                lines.append("Content-description: Digest Footer")
+                lines.append("Content-description: " + _("Digest Footer"))
             lines.append('')
             lines.append(self.__mlist.digest_footer % self.TemplateRefs())
         # Close:
@@ -317,7 +321,8 @@ class Digest:
             lines.append('')
             lines.append(dashbound + "--")
         lines.append('')
-        lines.append("End of %s Digest" % self.__mlist.real_name)
+        realname = self.__mlist.real_name
+        lines.append(_("End of %(realname)s Digest"))
         msg.body = string.join(lines, '\n')
         return msg