From de481a7eba9a5d47126a0bf3d5eccec4082a3cf2 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 1 Oct 2011 00:42:27 -0400 Subject: [PATCH] Help - Made all the usage strings for the 'help' command consistent with the implementation and with visual alignment. --- src/commands/CmdAdd.cpp | 2 +- src/commands/CmdBurndown.cpp | 6 +++--- src/commands/CmdCalendar.cpp | 2 +- src/commands/CmdColor.cpp | 2 +- src/commands/CmdColumns.cpp | 4 ++-- src/commands/CmdCommands.cpp | 4 ++-- src/commands/CmdConfig.cpp | 4 ++-- src/commands/CmdCount.cpp | 2 +- src/commands/CmdDiagnostics.cpp | 2 +- src/commands/CmdEdit.cpp | 2 +- src/commands/CmdExec.cpp | 2 +- src/commands/CmdExport.cpp | 2 +- src/commands/CmdHelp.cpp | 15 +-------------- src/commands/CmdHistory.cpp | 8 ++++---- src/commands/CmdIDs.cpp | 6 +++--- src/commands/CmdImport.cpp | 2 +- src/commands/CmdInfo.cpp | 2 +- src/commands/CmdInstall.cpp | 2 +- src/commands/CmdLog.cpp | 2 +- src/commands/CmdLogo.cpp | 2 +- src/commands/CmdMerge.cpp | 2 +- src/commands/CmdModify.cpp | 3 +-- src/commands/CmdProjects.cpp | 4 ++-- src/commands/CmdPull.cpp | 2 +- src/commands/CmdPush.cpp | 2 +- src/commands/CmdReports.cpp | 2 +- src/commands/CmdShell.cpp | 2 +- src/commands/CmdShow.cpp | 2 +- src/commands/CmdStatistics.cpp | 2 +- src/commands/CmdSummary.cpp | 2 +- src/commands/CmdSynch.cpp | 2 +- src/commands/CmdTags.cpp | 4 ++-- src/commands/CmdTimesheet.cpp | 2 +- src/commands/CmdUndo.cpp | 2 +- src/commands/CmdUrgency.cpp | 12 +++++++++--- src/commands/CmdVersion.cpp | 4 ++-- src/commands/Command.cpp | 2 +- 37 files changed, 58 insertions(+), 66 deletions(-) diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp index f8cc9e47f..6e02f3f8d 100644 --- a/src/commands/CmdAdd.cpp +++ b/src/commands/CmdAdd.cpp @@ -40,7 +40,7 @@ extern Context context; CmdAdd::CmdAdd () { _keyword = "add"; - _usage = "task add "; + _usage = "task add "; _description = STRING_CMD_ADD_USAGE; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdBurndown.cpp b/src/commands/CmdBurndown.cpp index a9eab1ac6..571216ba9 100644 --- a/src/commands/CmdBurndown.cpp +++ b/src/commands/CmdBurndown.cpp @@ -932,7 +932,7 @@ void Chart::calculateRates (std::vector & sequence) CmdBurndownMonthly::CmdBurndownMonthly () { _keyword = "burndown.monthly"; - _usage = "task burndown.monthly []"; + _usage = "task burndown.monthly"; _description = "Shows a graphical burndown chart, by month"; _read_only = true; _displays_id = false; @@ -970,7 +970,7 @@ int CmdBurndownMonthly::execute (std::string& output) CmdBurndownWeekly::CmdBurndownWeekly () { _keyword = "burndown.weekly"; - _usage = "task burndown.weekly []"; + _usage = "task burndown.weekly"; _description = "Shows a graphical burndown chart, by week"; _read_only = true; _displays_id = false; @@ -1008,7 +1008,7 @@ int CmdBurndownWeekly::execute (std::string& output) CmdBurndownDaily::CmdBurndownDaily () { _keyword = "burndown.daily"; - _usage = "task burndown.daily []"; + _usage = "task burndown.daily"; _description = "Shows a graphical burndown chart, by day"; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp index 7c6742de1..f8220a5a4 100644 --- a/src/commands/CmdCalendar.cpp +++ b/src/commands/CmdCalendar.cpp @@ -41,7 +41,7 @@ extern Context context; CmdCalendar::CmdCalendar () { _keyword = "calendar"; - _usage = "task calendar [due|month year|year]"; + _usage = "task calendar [due|month year|year]"; _description = "Shows a calendar, with due tasks marked."; _read_only = true; _displays_id = true; diff --git a/src/commands/CmdColor.cpp b/src/commands/CmdColor.cpp index 913879b9c..715c96ad3 100644 --- a/src/commands/CmdColor.cpp +++ b/src/commands/CmdColor.cpp @@ -41,7 +41,7 @@ extern Context context; CmdColor::CmdColor () { _keyword = "colors"; - _usage = "task colors [sample | legend]"; + _usage = "task colors [sample | legend]"; _description = STRING_CMD_COLOR_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp index 7ccf7cc3c..18d412998 100644 --- a/src/commands/CmdColumns.cpp +++ b/src/commands/CmdColumns.cpp @@ -42,7 +42,7 @@ extern Context context; CmdColumns::CmdColumns () { _keyword = "columns"; - _usage = "task columns"; + _usage = "task columns"; _description = STRING_CMD_COLUMNS_USAGE; _read_only = true; _displays_id = false; @@ -98,7 +98,7 @@ int CmdColumns::execute (std::string& output) CmdCompletionColumns::CmdCompletionColumns () { _keyword = "_columns"; - _usage = "task _columns"; + _usage = "task _columns"; _description = STRING_CMD_COLUMNS_USAGE2; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp index 492192fea..0c19aa1ee 100644 --- a/src/commands/CmdCommands.cpp +++ b/src/commands/CmdCommands.cpp @@ -41,7 +41,7 @@ extern Context context; CmdCompletionCommands::CmdCompletionCommands () { _keyword = "_commands"; - _usage = "task _commands"; + _usage = "task _commands"; _description = STRING_CMD_HCOMMANDS_USAGE; _read_only = true; _displays_id = false; @@ -77,7 +77,7 @@ int CmdCompletionCommands::execute (std::string& output) CmdZshCommands::CmdZshCommands () { _keyword = "_zshcommands"; - _usage = "task _zshcommands"; + _usage = "task _zshcommands"; _description = STRING_CMD_ZSHCOMMANDS_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp index c6a594aa1..05cd0905a 100644 --- a/src/commands/CmdConfig.cpp +++ b/src/commands/CmdConfig.cpp @@ -41,7 +41,7 @@ extern Context context; CmdConfig::CmdConfig () { _keyword = "config"; - _usage = "task config [name [value | '']]"; + _usage = "task config [name [value | '']]"; _description = STRING_CMD_CONFIG_USAGE; _read_only = true; _displays_id = false; @@ -178,7 +178,7 @@ int CmdConfig::execute (std::string& output) CmdCompletionConfig::CmdCompletionConfig () { _keyword = "_config"; - _usage = "task _config"; + _usage = "task _config"; _description = STRING_CMD_HCONFIG_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp index 9ef9a78ae..ccd59ff83 100644 --- a/src/commands/CmdCount.cpp +++ b/src/commands/CmdCount.cpp @@ -39,7 +39,7 @@ extern Context context; CmdCount::CmdCount () { _keyword = "count"; - _usage = "task count []"; + _usage = "task count"; _description = STRING_CMD_COUNT_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index 6a2bc79c1..d64f0e9fd 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -52,7 +52,7 @@ extern Context context; CmdDiagnostics::CmdDiagnostics () { _keyword = "diagnostics"; - _usage = "task diagnostics"; + _usage = "task diagnostics"; _description = STRING_CMD_DIAG_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp index d5bfe0350..623b09c8d 100644 --- a/src/commands/CmdEdit.cpp +++ b/src/commands/CmdEdit.cpp @@ -41,7 +41,7 @@ extern Context context; CmdEdit::CmdEdit () { _keyword = "edit"; - _usage = "task edit "; + _usage = "task edit"; _description = "Launches an editor to let you modify all aspects of a task " "directly, therefore it is to be used carefully."; _read_only = false; diff --git a/src/commands/CmdExec.cpp b/src/commands/CmdExec.cpp index 2506e97e4..f04ac1a81 100644 --- a/src/commands/CmdExec.cpp +++ b/src/commands/CmdExec.cpp @@ -38,7 +38,7 @@ extern Context context; CmdExec::CmdExec () { _keyword = "execute"; - _usage = "task execute "; + _usage = "task execute "; _description = STRING_CMD_EXEC_USAGE; _read_only = false; _displays_id = true; diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp index f3bea3368..e1928edf4 100644 --- a/src/commands/CmdExport.cpp +++ b/src/commands/CmdExport.cpp @@ -38,7 +38,7 @@ extern Context context; CmdExport::CmdExport () { _keyword = "export"; - _usage = "task export []"; + _usage = "task export"; _description = STRING_CMD_EXPORT_USAGE; _read_only = true; _displays_id = true; diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp index f2ec3b120..4f43aa850 100644 --- a/src/commands/CmdHelp.cpp +++ b/src/commands/CmdHelp.cpp @@ -37,7 +37,7 @@ extern Context context; CmdHelp::CmdHelp () { _keyword = "help"; - _usage = "task help"; + _usage = "task help"; _description = "Displays this usage help text"; _read_only = true; _displays_id = false; @@ -104,19 +104,6 @@ int CmdHelp::execute (std::string& output) view.set (row, 2, "Aliased to '" + alias->second + "'"); } -/* - row = view.addRow (); - view.set (row, 1, "task ID /from/to/g"); - view.set (row, 2, "Performs substitution on the task description and " - "annotations. The 'g' is optional, and causes " - "substitutions for all matching text, not just the " - "first occurrence."); - - row = view.addRow (); - view.set (row, 1, "task ID"); - view.set (row, 2, "Specifying an ID without a command invokes the 'info' command."); -*/ - output = "\n" + view.render () + "\n" diff --git a/src/commands/CmdHistory.cpp b/src/commands/CmdHistory.cpp index 63f109869..85ada6f12 100644 --- a/src/commands/CmdHistory.cpp +++ b/src/commands/CmdHistory.cpp @@ -41,7 +41,7 @@ extern Context context; CmdHistoryMonthly::CmdHistoryMonthly () { _keyword = "history.monthly"; - _usage = "task history.monthly []"; + _usage = "task history.monthly"; _description = STRING_CMD_HISTORY_USAGE_M; _read_only = true; _displays_id = false; @@ -196,7 +196,7 @@ int CmdHistoryMonthly::execute (std::string& output) CmdHistoryAnnual::CmdHistoryAnnual () { _keyword = "history.annual"; - _usage = "task history.annual []"; + _usage = "task history.annual"; _description = STRING_CMD_HISTORY_USAGE_A; _read_only = true; _displays_id = false; @@ -347,7 +347,7 @@ int CmdHistoryAnnual::execute (std::string& output) CmdGHistoryMonthly::CmdGHistoryMonthly () { _keyword = "ghistory.monthly"; - _usage = "task ghistory.monthly []"; + _usage = "task ghistory.monthly"; _description = STRING_CMD_GHISTORY_USAGE_M; _read_only = true; _displays_id = false; @@ -540,7 +540,7 @@ int CmdGHistoryMonthly::execute (std::string& output) CmdGHistoryAnnual::CmdGHistoryAnnual () { _keyword = "ghistory.annual"; - _usage = "task ghistory.annual []"; + _usage = "task ghistory.annual"; _description = STRING_CMD_GHISTORY_USAGE_A; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp index 9f83872b4..dd8e5df3f 100644 --- a/src/commands/CmdIDs.cpp +++ b/src/commands/CmdIDs.cpp @@ -41,7 +41,7 @@ extern Context context; CmdIDs::CmdIDs () { _keyword = "ids"; - _usage = "task ids []"; + _usage = "task ids"; _description = STRING_CMD_IDS_USAGE_RANGE; _read_only = true; _displays_id = true; @@ -72,7 +72,7 @@ int CmdIDs::execute (std::string& output) CmdCompletionIds::CmdCompletionIds () { _keyword = "_ids"; - _usage = "task _ids []"; + _usage = "task _ids"; _description = STRING_CMD_IDS_USAGE_LIST; _read_only = true; _displays_id = true; @@ -108,7 +108,7 @@ int CmdCompletionIds::execute (std::string& output) CmdZshCompletionIds::CmdZshCompletionIds () { _keyword = "_zshids"; - _usage = "task _zshids []"; + _usage = "task _zshids"; _description = STRING_CMD_IDS_USAGE_ZSH; _read_only = true; _displays_id = true; diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp index 5e1a7ad3f..550d315d7 100644 --- a/src/commands/CmdImport.cpp +++ b/src/commands/CmdImport.cpp @@ -44,7 +44,7 @@ extern Context context; CmdImport::CmdImport () { _keyword = "import"; - _usage = "task import [ ...]"; + _usage = "task import [ ...]"; _description = STRING_CMD_IMPORT_USAGE; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp index fdae05135..c0fc2b972 100644 --- a/src/commands/CmdInfo.cpp +++ b/src/commands/CmdInfo.cpp @@ -43,7 +43,7 @@ extern Context context; CmdInfo::CmdInfo () { _keyword = "information"; - _usage = "task information "; + _usage = "task information"; _description = STRING_CMD_INFO_USAGE; _read_only = true; diff --git a/src/commands/CmdInstall.cpp b/src/commands/CmdInstall.cpp index 93ea43ae6..72f5ac4ad 100644 --- a/src/commands/CmdInstall.cpp +++ b/src/commands/CmdInstall.cpp @@ -38,7 +38,7 @@ extern Context context; CmdInstall::CmdInstall () { _keyword = "install"; - _usage = "task install [ ...]"; + _usage = "task install [ ...]"; _description = STRING_CMD_INSTALL_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp index a33a3f792..d7dd9cfec 100644 --- a/src/commands/CmdLog.cpp +++ b/src/commands/CmdLog.cpp @@ -40,7 +40,7 @@ extern Context context; CmdLog::CmdLog () { _keyword = "log"; - _usage = "task log "; + _usage = "task log "; _description = STRING_CMD_LOG_USAGE; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdLogo.cpp b/src/commands/CmdLogo.cpp index edca0db97..352df091a 100644 --- a/src/commands/CmdLogo.cpp +++ b/src/commands/CmdLogo.cpp @@ -38,7 +38,7 @@ extern Context context; CmdLogo::CmdLogo () { _keyword = "logo"; - _usage = "task logo"; + _usage = "task logo"; _description = STRING_CMD_LOGO_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdMerge.cpp b/src/commands/CmdMerge.cpp index 72612f024..a517fac55 100644 --- a/src/commands/CmdMerge.cpp +++ b/src/commands/CmdMerge.cpp @@ -40,7 +40,7 @@ extern Context context; CmdMerge::CmdMerge () { _keyword = "merge"; - _usage = "task merge URL"; + _usage = "task merge URL"; _description = "Merges the specified undo.data file with the local data files."; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp index 562b1777a..a7766489a 100644 --- a/src/commands/CmdModify.cpp +++ b/src/commands/CmdModify.cpp @@ -42,8 +42,7 @@ extern Context context; CmdModify::CmdModify () { _keyword = "modify"; - _usage = "task modify \n" - "task "; + _usage = "task modify "; _description = std::string (STRING_CMD_MODIFY_USAGE1) + "\n" + STRING_CMD_MODIFY_USAGE2; diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp index e3f7fe266..612da66f7 100644 --- a/src/commands/CmdProjects.cpp +++ b/src/commands/CmdProjects.cpp @@ -41,7 +41,7 @@ extern Context context; CmdProjects::CmdProjects () { _keyword = "projects"; - _usage = "task projects []"; + _usage = "task projects"; _description = STRING_CMD_PROJECTS_USAGE; _read_only = true; _displays_id = false; @@ -154,7 +154,7 @@ int CmdProjects::execute (std::string& output) CmdCompletionProjects::CmdCompletionProjects () { _keyword = "_projects"; - _usage = "task _projects []"; + _usage = "task _projects"; _description = STRING_CMD_PROJECTS_USAGE_2; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdPull.cpp b/src/commands/CmdPull.cpp index d83983103..f6c0dd90a 100644 --- a/src/commands/CmdPull.cpp +++ b/src/commands/CmdPull.cpp @@ -42,7 +42,7 @@ extern Context context; CmdPull::CmdPull () { _keyword = "pull"; - _usage = "task pull URL"; + _usage = "task pull URL"; _description = STRING_CMD_PULL_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdPush.cpp b/src/commands/CmdPush.cpp index 820081fe7..a6febb3aa 100644 --- a/src/commands/CmdPush.cpp +++ b/src/commands/CmdPush.cpp @@ -42,7 +42,7 @@ extern Context context; CmdPush::CmdPush () { _keyword = "push"; - _usage = "task push URL"; + _usage = "task push URL"; _description = STRING_CMD_PUSH_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdReports.cpp b/src/commands/CmdReports.cpp index eab218e87..05b93c4db 100644 --- a/src/commands/CmdReports.cpp +++ b/src/commands/CmdReports.cpp @@ -41,7 +41,7 @@ extern Context context; CmdReports::CmdReports () { _keyword = "reports"; - _usage = "task reports"; + _usage = "task reports"; _description = STRING_CMD_REPORTS_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdShell.cpp b/src/commands/CmdShell.cpp index 7ae17ad9b..ee0a43be6 100644 --- a/src/commands/CmdShell.cpp +++ b/src/commands/CmdShell.cpp @@ -41,7 +41,7 @@ extern Context context; CmdShell::CmdShell () { _keyword = "shell"; - _usage = "task shell"; + _usage = "task shell"; _description = STRING_CMD_SHELL_USAGE; _read_only = false; _displays_id = true; diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp index f6a5590bf..3c80e9878 100644 --- a/src/commands/CmdShow.cpp +++ b/src/commands/CmdShow.cpp @@ -43,7 +43,7 @@ extern Context context; CmdShow::CmdShow () { _keyword = "show"; - _usage = "task show [all | substring]"; + _usage = "task show [all | substring]"; _description = STRING_CMD_SHOW; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdStatistics.cpp b/src/commands/CmdStatistics.cpp index 27bdd6d6f..d5c01c748 100644 --- a/src/commands/CmdStatistics.cpp +++ b/src/commands/CmdStatistics.cpp @@ -45,7 +45,7 @@ extern Context context; CmdStatistics::CmdStatistics () { _keyword = "stats"; - _usage = "task stats []"; + _usage = "task stats"; _description = STRING_CMD_STATS_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 9e1ef538d..6107a7396 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -43,7 +43,7 @@ extern Context context; CmdSummary::CmdSummary () { _keyword = "summary"; - _usage = "task summary"; + _usage = "task summary"; _description = STRING_CMD_SUMMARY_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdSynch.cpp b/src/commands/CmdSynch.cpp index 3da1c62b6..324ae0fc0 100644 --- a/src/commands/CmdSynch.cpp +++ b/src/commands/CmdSynch.cpp @@ -39,7 +39,7 @@ extern Context context; CmdSynch::CmdSynch () { _keyword = "synchronize"; - _usage = "task synchronize"; + _usage = "task synchronize"; _description = STRING_CMD_SYNCH_USAGE; _read_only = false; _displays_id = true; diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp index b8acf9d4b..84ea26345 100644 --- a/src/commands/CmdTags.cpp +++ b/src/commands/CmdTags.cpp @@ -42,7 +42,7 @@ extern Context context; CmdTags::CmdTags () { _keyword = "tags"; - _usage = "task tags"; + _usage = "task tags"; _description = STRING_CMD_TAGS_USAGE; _read_only = true; _displays_id = false; @@ -143,7 +143,7 @@ int CmdTags::execute (std::string& output) CmdCompletionTags::CmdCompletionTags () { _keyword = "_tags"; - _usage = "task _tags"; + _usage = "task _tags"; _description = STRING_CMD_COMTAGS_USAGE; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdTimesheet.cpp b/src/commands/CmdTimesheet.cpp index 7c494d0c2..485fb9db7 100644 --- a/src/commands/CmdTimesheet.cpp +++ b/src/commands/CmdTimesheet.cpp @@ -39,7 +39,7 @@ extern Context context; CmdTimesheet::CmdTimesheet () { _keyword = "timesheet"; - _usage = "task timesheet [weeks]"; + _usage = "task timesheet [weeks]"; _description = "Shows a weekly report of tasks completed and started."; _read_only = true; _displays_id = false; diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp index f7705a3c9..2f686a520 100644 --- a/src/commands/CmdUndo.cpp +++ b/src/commands/CmdUndo.cpp @@ -37,7 +37,7 @@ extern Context context; CmdUndo::CmdUndo () { _keyword = "undo"; - _usage = "task undo"; + _usage = "task undo"; _description = STRING_CMD_UNDO_USAGE; _read_only = false; _displays_id = false; diff --git a/src/commands/CmdUrgency.cpp b/src/commands/CmdUrgency.cpp index d0afd85aa..672cd4af2 100644 --- a/src/commands/CmdUrgency.cpp +++ b/src/commands/CmdUrgency.cpp @@ -41,7 +41,7 @@ extern Context context; CmdUrgency::CmdUrgency () { _keyword = "_urgency"; - _usage = "task _urgency "; + _usage = "task _urgency"; _description = STRING_CMD_URGENCY_USAGE; _read_only = true; _displays_id = false; @@ -64,8 +64,14 @@ int CmdUrgency::execute (std::string& output) std::stringstream out; std::vector ::iterator task; for (task = filtered.begin (); task != filtered.end (); ++task) - out << format (STRING_CMD_URGENCY_RESULT, task->id, task->urgency ()) - << "\n"; + if (task->id) + out << format (STRING_CMD_URGENCY_RESULT, + task->id, task->urgency ()) + << "\n"; + else + out << format (STRING_CMD_URGENCY_RESULT, + task->get ("uuid"), task->urgency ()) + << "\n"; output = out.str (); return 0; diff --git a/src/commands/CmdVersion.cpp b/src/commands/CmdVersion.cpp index 1a228f2ec..6375a3399 100644 --- a/src/commands/CmdVersion.cpp +++ b/src/commands/CmdVersion.cpp @@ -43,7 +43,7 @@ extern Context context; CmdVersion::CmdVersion () { _keyword = "version"; - _usage = "task version"; + _usage = "task version"; _description = STRING_CMD_VERSION_USAGE; _read_only = true; _displays_id = false; @@ -117,7 +117,7 @@ int CmdVersion::execute (std::string& output) CmdCompletionVersion::CmdCompletionVersion () { _keyword = "_version"; - _usage = "task _version"; + _usage = "task _version"; _description = STRING_CMD_VERSION_USAGE2; _read_only = true; _displays_id = false; diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index 7f0b9258d..d88095f19 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -186,7 +186,7 @@ void Command::factory (std::map & all) c = new CmdCustom ( *report, - "task " + *report + " []", + "task " + *report, context.config.get ("report." + *report + ".description")); all[c->keyword ()] = c;