From cbbee23e7768750ca1c8b49bdfbf8a650131bbb6 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 22 Oct 2015 16:28:54 +0200
Subject: split up help messages for simpler reuse

That is one huge commit with busy work only: Help messages used to be
one big translateable string, which is a pain for translators and hard
to reuse for us. This change there 'explodes' this single string into
new string for each documented string trying hard to split up the
translated messages as well. This actually restores many translations as
previously adding a single command made all of the bug message fuzzy.
The splitup also highlighted that its easy to forget a line, duplicate
one and similar stuff.

Git-Dch: Ignore
---
 cmdline/apt-mark.cc | 72 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'cmdline/apt-mark.cc')

diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 6080c7ea3..361d4e553 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -280,28 +280,27 @@ static bool ShowSelection(CommandLine &CmdL)				/*{{{*/
 }
 									/*}}}*/
 // ShowHelp - Show a help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &)
+static bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const * Cmds)
 {
    ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
 
-   cout <<
+   std::cout <<
     _("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
       "\n"
       "apt-mark is a simple command line interface for marking packages\n"
-      "as manually or automatically installed. It can also list marks.\n"
-      "\n"
-      "Commands:\n"
-      "   auto - Mark the given packages as automatically installed\n"
-      "   manual - Mark the given packages as manually installed\n"
-      "   hold - Mark a package as held back\n"
-      "   unhold - Unset a package set as held back\n"
-      "   showauto - Print the list of automatically installed packages\n"
-      "   showmanual - Print the list of manually installed packages\n"
-      "   showhold - Print the list of package on hold\n"
-      "\n"
-      "Options:\n"
+      "as manually or automatically installed. It can also list marks.\n")
+    << std::endl
+    << _("Commands:") << std::endl;
+
+   for (; Cmds->Handler != nullptr; ++Cmds)
+   {
+      if (Cmds->Help == nullptr)
+	 continue;
+      std::cout << "   " << Cmds->Match << " - " << Cmds->Help << std::endl;
+   }
+
+   std::cout << std::endl
+   << _("Options:\n"
       "  -h  This help text.\n"
       "  -q  Loggable output - no progress indicator\n"
       "  -qq No output except for errors\n"
@@ -316,26 +315,27 @@ static bool ShowHelp(CommandLine &)
 									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-   CommandLine::Dispatch Cmds[] = {{"help",&ShowHelp},
-				   {"auto",&DoAuto},
-				   {"manual",&DoAuto},
-				   {"hold",&DoSelection},
-				   {"unhold",&DoSelection},
-				   {"install",&DoSelection},
-				   {"remove",&DoSelection}, // dpkg uses deinstall, but we use remove everywhere else
-				   {"deinstall",&DoSelection},
-				   {"purge",&DoSelection},
-				   {"showauto",&ShowAuto},
-				   {"showmanual",&ShowAuto},
-				   {"showhold",&ShowSelection}, {"showholds",&ShowSelection},
-				   {"showinstall",&ShowSelection}, {"showinstalls",&ShowSelection},
-				   {"showdeinstall",&ShowSelection}, {"showdeinstalls",&ShowSelection},
-				   {"showremove",&ShowSelection}, {"showremoves",&ShowSelection},
-				   {"showpurge",&ShowSelection}, {"showpurges",&ShowSelection},
-				   // obsolete commands for compatibility
-				   {"markauto", &DoMarkAuto},
-				   {"unmarkauto", &DoMarkAuto},
-                                   {0,0}};
+   CommandLine::DispatchWithHelp Cmds[] = {
+      {"auto",&DoAuto, _("Mark the given packages as automatically installed")},
+      {"manual",&DoAuto, _("Mark the given packages as manually installed")},
+      {"hold",&DoSelection, _("Mark a package as held back")},
+      {"unhold",&DoSelection, _("Unset a package set as held back")},
+      {"install",&DoSelection, nullptr},
+      {"remove",&DoSelection, nullptr}, // dpkg uses deinstall, but we use remove everywhere else
+      {"deinstall",&DoSelection, nullptr},
+      {"purge",&DoSelection, nullptr},
+      {"showauto",&ShowAuto, _("Print the list of automatically installed packages")},
+      {"showmanual",&ShowAuto, _("Print the list of manually installed packages")},
+      {"showhold",&ShowSelection, _("Print the list of package on hold")}, {"showholds",&ShowSelection, nullptr},
+      {"showinstall",&ShowSelection, nullptr}, {"showinstalls",&ShowSelection, nullptr},
+      {"showdeinstall",&ShowSelection, nullptr}, {"showdeinstalls",&ShowSelection, nullptr},
+      {"showremove",&ShowSelection, nullptr}, {"showremoves",&ShowSelection, nullptr},
+      {"showpurge",&ShowSelection, nullptr}, {"showpurges",&ShowSelection, nullptr},
+      // obsolete commands for compatibility
+      {"markauto", &DoMarkAuto, nullptr},
+      {"unmarkauto", &DoMarkAuto, nullptr},
+      {nullptr, nullptr, nullptr}
+   };
 
    std::vector<CommandLine::Args> Args = getCommandArgs("apt-mark", CommandLine::GetCommand(Cmds, argc, argv));
 
-- 
cgit v1.2.3