[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.3-31-gd2adc48

[Francesco Poli (t1000)]

The following commit has been merged in the master branch:
commit 028b7291bc97273c34346df512c60b52276b10d7
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Tue Sep 28 22:20:46 2010 +0200

    enhance stylistic consistency in questions to user

diff --git a/debian/changelog b/debian/changelog
index 454fd22..8caf8d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,12 +19,13 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
     page), not 10 (which is reserved for warning APT not to proceed)
   * added minimal handling of errors encountered when reading package fields
   * bumped Standards-Version to 3.9.1: no changes needed
+  * enhanced stylistic consistency in questions to user
 
   [ Ryan Niebur ]
   * updated German translation, thanks Thomas Mueller! (Closes: #578305)
   * flush stdin after running the web browser (Closes: #578299)
 
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 26 Sep 2010 16:10:07 +0200
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Tue, 28 Sep 2010 22:15:39 +0200
 
 apt-listbugs (0.1.3) unstable; urgency=low
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index ba5d020..5ebed5d 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -426,7 +426,7 @@ class Viewer
             }
 	  end
 	  if pkgs.size != 0
-	    if @config.frontend.yes_or_no? sprintf(ngettext("The following %d package will be pinned or on hold:\n %s\nAre you sure ", "The following %d packages will be pinned or on hold:\n %s\nAre you sure ", pkgs.size), pkgs.size, pkgs.keys.join(', '))
+	    if @config.frontend.yes_or_no? sprintf(ngettext("The following %d package will be pinned or on hold:\n %s\nAre you sure?", "The following %d packages will be pinned or on hold:\n %s\nAre you sure?", pkgs.size), pkgs.size, pkgs.keys.join(', '))
 	      if key == "h"
                 h = on_hold(pkgs.keys)
               else
@@ -868,7 +868,7 @@ module Factory
         $stderr.puts _(" E: HTTP GET failed")
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation"))
+        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
         bugs = []
       rescue SOAP::EmptyResponseError => exception
         config.frontend.puts _(" Fail")
@@ -876,7 +876,7 @@ module Factory
         $stderr.puts _(" E: Empty stream from SOAP")
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation"))
+        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
         bugs = []
       rescue Exception => exception
         config.frontend.puts _(" Fail")
@@ -890,7 +890,7 @@ module Factory
         end
         retrycount -= 1
         retry if config.frontend.yes_or_no?(_("Retry downloading bug information?")) && retrycount > 0
-        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation"))
+        raise _("Exiting with error") if config.frontend.yes_or_no?(_("Abort the installation?"))
         bugs = []
       end
       yield _("Retrieving bug reports..."), "100%"
@@ -1176,9 +1176,9 @@ class ConsoleFrontend
     while true
       msgyn = "#{msg}"
       if default == true
-	msgyn << "[Y/n]?"
+	msgyn << " [Y/n] "
       else
-	msgyn << "[y/N]?"
+	msgyn << " [y/N] "
       end
       a = ask msgyn
       if a == ""

-- 
apt-listbugs development tree