GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug Fix

Browse source 
- Next report once again shows up in the help output.
This commit is contained in:
Paul Beckingham 2009-07-06 19:06:04 -04:00
parent 98553e0196
commit 56a0997ecf
6 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
i18n/strings.de-DE
View file

@ -45,7 +45,7 @@
214 ggeschichte #ghistory 214 ggeschichte #ghistory
215 import #import 215 import #import
216 info #info 216 info #info
217 nächste #next
218 überfällig #overdue 218 überfällig #overdue
219 projekte #projects 219 projekte #projects
220 start #start 220 start #start

2
i18n/strings.en-US
View file

@ -46,7 +46,7 @@
214 ghistory 214 ghistory
215 import 215 import
216 info 216 info
217 next
218 overdue 218 overdue
219 projects 219 projects
220 start 220 start

2
i18n/strings.sv-SE
View file

@ -45,7 +45,7 @@
214 ghistoria #ghistory 214 ghistoria #ghistory
215 importera #import 215 importera #import
216 info #info 216 info #info
217 nästa #next
218 försenad #overdue 218 försenad #overdue
219 projekten #projects 219 projekten #projects
220 start #start 220 start #start

10
src/Cmd.cpp
View file

@ -124,7 +124,6 @@ void Cmd::load ()
commands.push_back (context.stringtable.get (CMD_GHISTORY, "ghistory")); commands.push_back (context.stringtable.get (CMD_GHISTORY, "ghistory"));
commands.push_back (context.stringtable.get (CMD_IMPORT, "import")); commands.push_back (context.stringtable.get (CMD_IMPORT, "import"));
commands.push_back (context.stringtable.get (CMD_INFO, "info")); commands.push_back (context.stringtable.get (CMD_INFO, "info"));
commands.push_back (context.stringtable.get (CMD_NEXT, "next"));
commands.push_back (context.stringtable.get (CMD_PROJECTS, "projects")); commands.push_back (context.stringtable.get (CMD_PROJECTS, "projects"));
#ifdef FEATURE_SHELL #ifdef FEATURE_SHELL
commands.push_back (context.stringtable.get (CMD_SHELL, "shell")); commands.push_back (context.stringtable.get (CMD_SHELL, "shell"));
@ -147,14 +146,6 @@ void Cmd::load ()
if (i->substr (0, 7) == "report.") if (i->substr (0, 7) == "report.")
{ {
std::string report = i->substr (7, std::string::npos); std::string report = i->substr (7, std::string::npos);
// Oh, what a massive hack. Shame. Shame.
// The "next" report is in limbo between being a built-in report and
// a custom report. The projection is defined as a custom report, but
// the restriction is different.
if (report.substr (0, 4) == "next")
continue;
std::string::size_type columns = report.find (".columns"); std::string::size_type columns = report.find (".columns");
if (columns != std::string::npos) if (columns != std::string::npos)
{ {
@ -205,7 +196,6 @@ bool Cmd::isReadOnlyCommand ()
command == context.stringtable.get (CMD_HISTORY, "history") || command == context.stringtable.get (CMD_HISTORY, "history") ||
command == context.stringtable.get (CMD_GHISTORY, "ghistory") || command == context.stringtable.get (CMD_GHISTORY, "ghistory") ||
command == context.stringtable.get (CMD_INFO, "info") || command == context.stringtable.get (CMD_INFO, "info") ||
command == context.stringtable.get (CMD_NEXT, "next") ||
command == context.stringtable.get (CMD_PROJECTS, "projects") || command == context.stringtable.get (CMD_PROJECTS, "projects") ||
command == context.stringtable.get (CMD_SHELL, "shell") || command == context.stringtable.get (CMD_SHELL, "shell") ||
command == context.stringtable.get (CMD_STATS, "stats") || command == context.stringtable.get (CMD_STATS, "stats") ||

4
src/Config.cpp
View file

@ -233,7 +233,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
<< "report.all.sort=due+,priority-,project+\n" << "report.all.sort=due+,priority-,project+\n"
<< "\n" << "\n"
<< "# task next\n" << "# task next\n"
<< "report.next.description=Lists all tasks matching the specified criteria\n" << "report.next.description=Lists the most urgent tasks\n"
<< "report.next.columns=id,project,priority,due,active,age,description\n" << "report.next.columns=id,project,priority,due,active,age,description\n"
<< "report.next.labels=ID,Project,Pri,Due,Active,Age,Description\n" << "report.next.labels=ID,Project,Pri,Due,Active,Age,Description\n"
<< "report.next.sort=due+,priority-,project+\n" << "report.next.sort=due+,priority-,project+\n"
@ -318,7 +318,7 @@ void Config::setDefaults ()
set ("report.all.labels", "ID,Project,Pri,Due,Active,Age,Description"); // TODO i18n set ("report.all.labels", "ID,Project,Pri,Due,Active,Age,Description"); // TODO i18n
set ("report.all.sort", "due+,priority-,project+"); // TODO i18n set ("report.all.sort", "due+,priority-,project+"); // TODO i18n
set ("report.next.description", "Lists all tasks matching the specified criteria"); // TODO i18n set ("report.next.description", "Lists the most urgent tasks"); // TODO i18n
set ("report.next.columns", "id,project,priority,due,active,age,description"); // TODO i18n set ("report.next.columns", "id,project,priority,due,active,age,description"); // TODO i18n
set ("report.next.labels", "ID,Project,Pri,Due,Active,Age,Description"); // TODO i18n set ("report.next.labels", "ID,Project,Pri,Due,Active,Age,Description"); // TODO i18n
set ("report.next.sort", "due+,priority-,project+"); // TODO i18n set ("report.next.sort", "due+,priority-,project+"); // TODO i18n

2
src/i18n.h
View file

@ -83,7 +83,7 @@
#define CMD_GHISTORY 214 #define CMD_GHISTORY 214
#define CMD_IMPORT 215 #define CMD_IMPORT 215
#define CMD_INFO 216 #define CMD_INFO 216
#define CMD_NEXT 217
#define CMD_OVERDUE 218 #define CMD_OVERDUE 218
#define CMD_PROJECTS 219 #define CMD_PROJECTS 219
#define CMD_START 220 #define CMD_START 220