* include a human readable string for the MediaChange status-fd message as well

diff --git a/README.progress-reporting b/README.progress-reporting
index 285ca6190487e1eb2f10e219bdce894a19e8f57d..b575e7879d4c8960fb4a57c6fac5cfe5bf782370 100644 (file)
--- a/README.progress-reporting
+++ b/README.progress-reporting
@@ -49,10 +49,10 @@ pmconffile:conffile:percent:'current-conffile' 'new-conffile' useredited distedi
 
 media-change
 ------------
 
 media-change
 ------------

-media-change:medium:drive
+media-change:medium:drive:human-readable string

 
 example:
 
 example:

-media-change: Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830):/cdrom/
+media-change: Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830):/cdrom/:Please insert the disc labeled: 'Ubuntu 5.10 _Breezy Badger_ - Alpha i386 (20050830)' in the drive '/cdrom/' and press enter.

 
 
 dlstatus
 
 
 dlstatus

diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index e2b8bf9e4f01841bce2b41c04360a4d8b7cd01ed..d06024178ef4fe17fe4adf97a7b14a7aa2423579 100644 (file)
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -374,9 +374,14 @@ bool pkgAcquire::Worker::MediaChange(string Message)
       string Media = LookupTag(Message,"Media");
       string Drive = LookupTag(Message,"Drive"); 
       ostringstream msg,status;
       string Media = LookupTag(Message,"Media");
       string Drive = LookupTag(Message,"Drive"); 
       ostringstream msg,status;

+      ioprintf(msg,_("Please insert the disc labeled: "
+                    "'%s' "
+                    "in the drive '%s' and press enter."),
+              Media.c_str(),Drive.c_str());

       status << "media-change: "  // message
       status << "media-change: "  // message

-            << Media  << ":"     //media
-            << Drive  //drive
+            << Media  << ":"     // media
+            << Drive  << ":"     // drive
+            << msg.str()         // l10n message

             << endl;
       write(status_fd, status.str().c_str(), status.str().size());
    }
             << endl;
       write(status_fd, status.str().c_str(), status.str().size());
    }