pager: print progress percentage for attachments, too

diff --git a/ChangeLog b/ChangeLog
index df528363e77b48c90e5b1e43594a3c1949020858..965da638589077569d88c715919ab9d7347f6265 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-25 15:25 +0200  Rocco Rutte  <pdmef@gmx.net>  (1b9ca049cbc1)
+
+       * attach.c: Mark strings for translation
+
+2009-05-18 20:48 -0700  Vincent Lefevre  <vincent@vinc17.org>  (6d810c5cf4fc)
+
+       * ChangeLog, po/fr.po: Updated French translation.
+
 2009-05-15 15:03 +0200  Takahashi Tamotsu  <ttakah@lapis.plala.or.jp>  (c665bdf5ff5f)
 
        * pop.c: POP: Notify user when messages are lost. Closes #2226.

diff --git a/pager.c b/pager.c
index 617d0fe7ecc518694e7fee39412c7ea85fc1e8d9..8443cd75dd7ac372587ed274a359e84b133d199a 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1812,21 +1812,21 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       SETCOLOR (MT_COLOR_STATUS);
       BKGDSET (MT_COLOR_STATUS);
       CLEARLINE (statusoffset);
-      if (IsHeader (extra))
+
+      if (IsHeader (extra) || IsMsgAttach (extra))
       {
        size_t l1 = COLS * MB_LEN_MAX;
        size_t l2 = sizeof (buffer);
-       hfi.hdr = extra->hdr;
+       hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
        mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+       mutt_paddstr (COLS, buffer);
       }
-      else if (IsMsgAttach (extra))
+      else
       {
-       size_t l1 = COLS * MB_LEN_MAX;
-       size_t l2 = sizeof (buffer);
-       hfi.hdr = extra->bdy->hdr;
-       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+       char bn[STRING];
+       snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
+       mutt_paddstr (COLS, bn);
       }
-      mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
       BKGDSET (MT_COLOR_NORMAL);
       SETCOLOR (MT_COLOR_NORMAL);
     }