From cbbee23e7768750ca1c8b49bdfbf8a650131bbb6 Mon Sep 17 00:00:00 2001 From: David Kalnischkies 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 --- apt-pkg/contrib/cmndline.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'apt-pkg/contrib/cmndline.h') diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index 58cbaa8c3..a698a18b8 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -57,6 +57,7 @@ class CommandLine public: struct Args; struct Dispatch; + struct DispatchWithHelp; protected: @@ -84,9 +85,13 @@ class CommandLine void ShowHelp(); unsigned int FileSize() const APT_PURE; bool DispatchArg(Dispatch *List,bool NoMatch = true); + bool DispatchArg(DispatchWithHelp *List,bool NoMatch = true); static char const * GetCommand(Dispatch const * const Map, unsigned int const argc, char const * const * const argv) APT_PURE; + static char const * GetCommand(DispatchWithHelp const * const Map, + unsigned int const argc, char const * const * const argv) APT_PURE; + static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt, char const *ConfName, unsigned long Flags) APT_CONST; @@ -112,5 +117,11 @@ struct CommandLine::Dispatch const char *Match; bool (*Handler)(CommandLine &); }; +struct CommandLine::DispatchWithHelp +{ + const char *Match; + bool (*Handler)(CommandLine &); + const char *Help; +}; #endif -- cgit v1.2.3-70-g09d2