update_article(): Reword the messages for proper i18n style. Closes

SF bug #648604.

1 files changed, 9 insertions, 6 deletions

diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index 9df36c88e..4a0a381c6 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -27,6 +27,7 @@
 
 import sys
 import re
+import errno
 import urllib
 import time
 import os
@@ -1228,19 +1229,21 @@ class HyperArchive(pipermail.T):
         return article
 
     def update_article(self, arcdir, article, prev, next):
-        self.message(_('Updating HTML for article ') + str(article.sequence))
+        seq = article.sequence
+        filename = os.path.join(arcdir, article.filename)
+        self.message(_('Updating HTML for article %(seq)s'))
         try:
-            f = open(os.path.join(arcdir, article.filename))
+            f = open(filename)
             article.loadbody_fromHTML(f)
             f.close()
-        except IOError:
-            self.message(_("article file %s is missing!")
-                         % os.path.join(arcdir, article.filename))
+        except IOError, e:
+            if e.errno <> errno.ENOENT: raise
+            self.message(_('article file %(filename)s is missing!'))
         article.prev = prev
         article.next = next
         omask = os.umask(002)
         try:
-            f = open(os.path.join(arcdir, article.filename), 'w')
+            f = open(filename, 'w')
         finally:
             os.umask(omask)
         f.write(article.as_html())