gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Confirmation

Browse Source 
- Removed confirmation override imposed by the 'delete' command.  Consistency
  prevails.
This commit is contained in:
Paul Beckingham
2011-10-15 19:11:55 -04:00
parent 23991f72da
commit 548272fb3a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands/CmdDelete.cpp
View File

@@ -40,11 +40,11 @@ extern Context context;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
CmdDelete::CmdDelete () CmdDelete::CmdDelete ()
{ {
_keyword = "delete"; _keyword = "delete";
_usage = "task <filter> delete <mods>"; _usage = "task <filter> delete <mods>";
_description = STRING_CMD_DELETE_USAGE; _description = STRING_CMD_DELETE_USAGE;
_read_only = false; _read_only = false;
_displays_id = false; _displays_id = false;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

3
src/commands/Command.cpp
View File

@@ -596,7 +596,7 @@ bool Command::permission (
return answer; return answer;
} }
// Quantity < bulk modifications have optional confirmation, in the (y/n/a/q) // 1 < Quantity < bulk modifications have optional confirmation, in the (y/n/a/q)
// style. // style.
if (quantity < bulk && !confirmation) if (quantity < bulk && !confirmation)
return true; return true;
@@ -608,7 +608,6 @@ bool Command::permission (
case 1: return true; // yes case 1: return true; // yes
case 2: _permission_all = true; return true; // all case 2: _permission_all = true; return true; // all
case 3: _permission_quit = true; return false; // quit case 3: _permission_quit = true; return false; // quit
case 4: return false; // no
} }
return false; // This line keeps the compiler happy. return false; // This line keeps the compiler happy.

2
src/en-US.h
View File

@@ -815,7 +815,7 @@
"\n" "\n"
// util // util
#define STRING_UTIL_CONFIRM_YN " (y/n) " #define STRING_UTIL_CONFIRM_YN " (yes/no) "
#define STRING_UTIL_CONFIRM_YES "yes" #define STRING_UTIL_CONFIRM_YES "yes"
#define STRING_UTIL_CONFIRM_YES_U "Yes" #define STRING_UTIL_CONFIRM_YES_U "Yes"
#define STRING_UTIL_CONFIRM_NO "no" #define STRING_UTIL_CONFIRM_NO "no"