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

Import

Browse source 
- Orphaned UDAs now survive import.
This commit is contained in:
Paul Beckingham 2012-07-04 14:29:12 -04:00
parent 7eebfba1ef
commit 416cb40e3d
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/commands/CmdImport.cpp
View file

@ -154,6 +154,7 @@ int CmdImport::execute (std::string& output)
// mask
// imask
// parent
// UDA orphans
else
{
// Annotations are an array of JSON objects with 'entry' and
@ -194,8 +195,11 @@ int CmdImport::execute (std::string& output)
task.set (i->first, unquoteText (i->second->dump ()));
}
// UDA Orphan - must be preserved.
else
throw format (STRING_CMD_IMPORT_BAD_ATT, i->first);
{
task.set (i->first, unquoteText (i->second->dump ()));
}
}
}

2
src/en-US.h
View file

@ -399,7 +399,6 @@
#define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks."
#define STRING_CMD_IMPORT_NOFILE "You must specify a file to import."
#define STRING_CMD_IMPORT_FILE "Importing '{1}'"
#define STRING_CMD_IMPORT_BAD_ATT "Unrecognized attribute '{1}'"
#define STRING_CMD_IMPORT_NOT_JSON "Not a JSON object: {1}"
#define STRING_CMD_IMPORT_NO_DESC "Annotation is missing a description: {1}"
#define STRING_CMD_IMPORT_NO_ENTRY "Annotation is missing an entry date: {1}"
@ -783,7 +782,6 @@
#define STRING_TASK_VALID_BLANK "Cannot add a task that is blank."
#define STRING_TASK_VALID_BEFORE "Warning: You have specified that the '{1}' date is after the '{2}' date."
#define STRING_TASK_VALID_REC_DUE "A recurring task must also have a 'due' date."
#define STRING_TASK_VALID_UNTIL "Only recurring tasks may have an 'until' date."
#define STRING_TASK_VALID_RECUR "The recurrence value '{1}' is not valid."
#define STRING_TASK_VALID_PRIORITY "Priority values may be 'H', 'M' or 'L', not '{1}'."
#define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all tasks. Are you sure?"