diff --git a/src/Task.cpp b/src/Task.cpp index c415f2476..0ac65d278 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -2176,7 +2176,7 @@ void Task::modify (modType type, bool text_required /* = false */) } } else if (! mods && text_required) - throw std::string (STRING_CMD_MODIFY_NEED_TEXT); + throw std::string ("Additional text must be provided."); // Modifying completed/deleted tasks generates a message, if the modification // does not change status. @@ -2184,7 +2184,7 @@ void Task::modify (modType type, bool text_required /* = false */) getStatus () == originalStatus) { auto uuid = get ("uuid").substr (0, 8); - context.footnote (format (STRING_CMD_MODIFY_INACTIVE, uuid, get ("status"), uuid)); + context.footnote (format ("Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending", uuid, get ("status"), uuid)); } } #endif diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp index da55775d7..2ac074c44 100644 --- a/src/commands/CmdModify.cpp +++ b/src/commands/CmdModify.cpp @@ -34,6 +34,9 @@ #include #include +#define STRING_CMD_MODIFY_TASK_R "Modifying recurring task {1} '{2}'." +#define STRING_CMD_MODIFY_RECUR "This is a recurring task. Do you want to modify all pending recurrences of this same task?" + extern Context context; //////////////////////////////////////////////////////////////////////////////// @@ -41,7 +44,7 @@ CmdModify::CmdModify () { _keyword = "modify"; _usage = "task modify "; - _description = STRING_CMD_MODIFY_USAGE1; + _description = "Modifies the existing task with provided arguments."; _read_only = false; _displays_id = false; _needs_gc = false; @@ -81,7 +84,7 @@ int CmdModify::execute (std::string&) // Abort if change introduces inconsistencies. checkConsistency(before, task); - auto question = format (STRING_CMD_MODIFY_CONFIRM, + auto question = format ("Modify task {1} '{2}'?", task.identifier (true), task.get ("description")); @@ -91,7 +94,7 @@ int CmdModify::execute (std::string&) } else { - std::cout << STRING_CMD_MODIFY_NO << '\n'; + std::cout << "Task not modified.\n"; rc = 1; if (_permission_quit) break; @@ -104,7 +107,7 @@ int CmdModify::execute (std::string&) if (change.first != "") context.footnote (change.second); - feedback_affected (count == 1 ? STRING_CMD_MODIFY_1 : STRING_CMD_MODIFY_N, count); + feedback_affected (count == 1 ? "Modified {1} task." : "Modified {1} tasks.", count); return rc; } @@ -116,18 +119,18 @@ void CmdModify::checkConsistency (Task &before, Task &after) if (after.has ("recur") && ! after.has ("due") && ! before.has ("due")) - throw std::string (STRING_CMD_MODIFY_NO_DUE); + throw std::string ("You cannot specify a recurring task without a due date."); if (before.has ("recur") && before.has ("due") && (! after.has ("due") || after.get ("due") == "")) - throw std::string (STRING_CMD_MODIFY_REM_DUE); + throw std::string ("You cannot remove the due date from a recurring task."); if (before.has ("recur") && (! after.has ("recur") || after.get ("recur") == "")) - throw std::string (STRING_CMD_MODIFY_REC_ALWAYS); + throw std::string ("You cannot remove the recurrence from a recurring task."); } //////////////////////////////////////////////////////////////////////////////// @@ -139,7 +142,7 @@ int CmdModify::modifyAndUpdate ( auto count = 1; updateRecurrenceMask (after); - feedback_affected (STRING_CMD_MODIFY_TASK, after); + feedback_affected ("Modifying task {1} '{2}'.", after); feedback_unblocked (after); context.tdb2.modify (after); if (context.verbose ("project") && projectChanges) diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 43ffb01f5..8c1b93abe 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -296,20 +296,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Erzeugt eine Liste Eigenschaften zur ZSH-Auto-Vervollständigung" #define STRING_CMD_ALIASES_USAGE "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung" -#define STRING_CMD_MODIFY_USAGE1 "Ändert eine bestehende Aufgabe mit den übergebenen Parametern" -#define STRING_CMD_MODIFY_NO_DUE "Wiederholende Aufgaben können nicht ohne Fälligkeitsdatum angelegt werden." -#define STRING_CMD_MODIFY_REM_DUE "Das Fälligkeitsdatum einer wiederholenden Aufgabe kann nicht gelöscht werden." -#define STRING_CMD_MODIFY_REC_ALWAYS "Die Periode einer wiederholenden Aufgabe kann nicht gelöscht werden." -#define STRING_CMD_MODIFY_TASK "Ändere Aufgabe {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Ändere wiederholende Aufgabe {1} '{2}'." -#define STRING_CMD_MODIFY_1 "{1} Aufgabe geändert." -#define STRING_CMD_MODIFY_N "{1} Aufgaben geändert." -#define STRING_CMD_MODIFY_NO "Aufgabe nicht geändert." -#define STRING_CMD_MODIFY_CONFIRM "Aufgabe {1} '{2}' ändern?" -#define STRING_CMD_MODIFY_RECUR "Dies ist eine wiederholende Aufgabe. Möchten Sie alle offenen Wiederholungen dieser Aufgabe ändern?" -#define STRING_CMD_MODIFY_NEED_TEXT "Weiterer Text muss angegeben werden." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "Alle Farben, ein Beispiel, oder eine Legende" #define STRING_CMD_COLOR_HERE "Diese Farben werden zur Zeit genutzt:" #define STRING_CMD_COLOR_COLOR "Farbe" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 29124da30..46141c59c 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -293,20 +293,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments." -#define STRING_CMD_MODIFY_NO_DUE "You cannot specify a recurring task without a due date." -#define STRING_CMD_MODIFY_REM_DUE "You cannot remove the due date from a recurring task." -#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task." -#define STRING_CMD_MODIFY_TASK "Modifying task {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modifying recurring task {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Modified {1} task." -#define STRING_CMD_MODIFY_N "Modified {1} tasks." -#define STRING_CMD_MODIFY_NO "Task not modified." -#define STRING_CMD_MODIFY_CONFIRM "Modify task {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "This is a recurring task. Do you want to modify all pending recurrences of this same task?" -#define STRING_CMD_MODIFY_NEED_TEXT "Additional text must be provided." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" #define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" #define STRING_CMD_COLOR_COLOR "Color" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 9c2da5e30..2812ce13e 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -296,20 +296,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments." -#define STRING_CMD_MODIFY_NO_DUE "You cannot specify a recurring task without a due date." -#define STRING_CMD_MODIFY_REM_DUE "You cannot remove the due date from a recurring task." -#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task." -#define STRING_CMD_MODIFY_TASK "Modifying task {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modifying recurring task {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Modified {1} task." -#define STRING_CMD_MODIFY_N "Modified {1} tasks." -#define STRING_CMD_MODIFY_NO "Task not modified." -#define STRING_CMD_MODIFY_CONFIRM "Modify task {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "This is a recurring task. Do you want to modify all pending recurrences of this same task?" -#define STRING_CMD_MODIFY_NEED_TEXT "Additional text must be provided." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" #define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" #define STRING_CMD_COLOR_COLOR "Color" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index af598149b..5cabb9d36 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -305,21 +305,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Genera una lista de todos los atributos, con fines de auto-completado zsh" #define STRING_CMD_ALIASES_USAGE "Genera una lista de todos los alias, con fines de auto-completado" -#define STRING_CMD_MODIFY_USAGE1 "Modifica la tarea existente con los argumentos provistos." -//#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments." -#define STRING_CMD_MODIFY_NO_DUE "No puede especificar una tarea recurrente sin una fecha de vencimiento." -#define STRING_CMD_MODIFY_REM_DUE "No puede eliminar la fecha de vencimiento de una tarea recurrente." -#define STRING_CMD_MODIFY_REC_ALWAYS "No puede eliminar la recurrencia de una tarea recurrente." -#define STRING_CMD_MODIFY_TASK "Modificando tarea {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modificando tarea recurrente {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Modificada {1} tarea." -#define STRING_CMD_MODIFY_N "Modificada {1} tareas." -#define STRING_CMD_MODIFY_NO "Tarea no modificada." -#define STRING_CMD_MODIFY_CONFIRM "¿Modificar tarea {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "Esta es una tarea recurrente. ¿Quiere modificar todas las recurrencias pendientes de esta misma tarea?" -#define STRING_CMD_MODIFY_NEED_TEXT "Se debe proveer texto adicional." -#define STRING_CMD_MODIFY_INACTIVE "Nota: la tarea modificada {1} está {2}. Podría querer marcar esta tarea como pendiente con: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "Todos los colores, una muestra, o una leyenda" #define STRING_CMD_COLOR_HERE "Aquí están los colores en uso actualmente:" #define STRING_CMD_COLOR_COLOR "Color" // |esp-ESP|==|eng-USA| diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index f0ac7e10e..1c0e0b507 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -298,20 +298,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments." -#define STRING_CMD_MODIFY_NO_DUE "You cannot specify a recurring task without a due date." -#define STRING_CMD_MODIFY_REM_DUE "You cannot remove the due date from a recurring task." -#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task." -#define STRING_CMD_MODIFY_TASK "Modifying task {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modifying recurring task {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Modified {1} task." -#define STRING_CMD_MODIFY_N "Modified {1} tasks." -#define STRING_CMD_MODIFY_NO "Tâche non modifiée" -#define STRING_CMD_MODIFY_CONFIRM "Modify task {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "This is a recurring task. Do you want to modify all pending recurrences of this same task?" -#define STRING_CMD_MODIFY_NEED_TEXT "Additional text must be provided." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" #define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" #define STRING_CMD_COLOR_COLOR "Color" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 81e531449..8d9cab162 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -297,20 +297,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Genera la lista di tutti gli alias, per autocompletamento" -#define STRING_CMD_MODIFY_USAGE1 "Modifica il task esistente usando gli argomenti specificati." -#define STRING_CMD_MODIFY_NO_DUE "Impossibile specificare un task periodico senza una data di scadenza." -#define STRING_CMD_MODIFY_REM_DUE "Impossibile eliminare una scadenza da un task periodico" -#define STRING_CMD_MODIFY_REC_ALWAYS "Impossibile rimuovere un evento da un task periodico." -#define STRING_CMD_MODIFY_TASK "Modifica del task {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modifica del task periodico {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Task {1} modificato." -#define STRING_CMD_MODIFY_N "Task {1} modificati." -#define STRING_CMD_MODIFY_NO "Task non modificato." -#define STRING_CMD_MODIFY_CONFIRM "Modificare il task {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "Questo è un task periodico. Modificare tutti i task associati?" -#define STRING_CMD_MODIFY_NEED_TEXT "Testo aggiunti da specificare." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "Tutti i colori, un esempio, o una legenda" #define STRING_CMD_COLOR_HERE "Coloti in uso:" #define STRING_CMD_COLOR_COLOR "Colore" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 69db8e6b7..5556092e8 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -298,20 +298,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" -#define STRING_CMD_MODIFY_USAGE1 "Modifies the existing task with provided arguments." -#define STRING_CMD_MODIFY_NO_DUE "You cannot specify a recurring task without a due date." -#define STRING_CMD_MODIFY_REM_DUE "You cannot remove the due date from a recurring task." -#define STRING_CMD_MODIFY_REC_ALWAYS "You cannot remove the recurrence from a recurring task." -#define STRING_CMD_MODIFY_TASK "タスク {1} '{2}' を変更します。" -#define STRING_CMD_MODIFY_TASK_R "Modifying recurring task {1} '{2}'." -#define STRING_CMD_MODIFY_1 "{1} タスク を変更。" -#define STRING_CMD_MODIFY_N "{1} タスク を変更。" -#define STRING_CMD_MODIFY_NO "タスク は変更されませんでした。" -#define STRING_CMD_MODIFY_CONFIRM "タスク {1} '{2}' を変更しますか?" -#define STRING_CMD_MODIFY_RECUR "This is a recurring task. Do you want to modify all pending recurrences of this same task?" -#define STRING_CMD_MODIFY_NEED_TEXT "Additional text must be provided." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "All colors, a sample, or a legend" #define STRING_CMD_COLOR_HERE "Here are the colors currently in use:" #define STRING_CMD_COLOR_COLOR "Color" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index ab514df14..b137eadbf 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -298,20 +298,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Generates a list of all attributes, for zsh autocompletion purposes" #define STRING_CMD_ALIASES_USAGE "Generuje listę wszystkich aliasów dla funkcji autouzupełniania" -#define STRING_CMD_MODIFY_USAGE1 "Modyfikuje istniejące zadanie pod kątem podanych argumentów." -#define STRING_CMD_MODIFY_NO_DUE "Nie możesz specyfikować rekurencyjnego zadania bez podania terminu." -#define STRING_CMD_MODIFY_REM_DUE "Nie możesz usunąć właściwości 'termin' z zadanie rekurencyjnego." -#define STRING_CMD_MODIFY_REC_ALWAYS "Nie możesz usunąć właściwości 'rekurencja' z zadania rekurencyjnego." -#define STRING_CMD_MODIFY_TASK "Modyfikacja zadania {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "Modyfikacja zadania rekurencyjnego {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Zmodyfikowano {1} zadanie." -#define STRING_CMD_MODIFY_N "Zmodyfikowano {1} zadań." -#define STRING_CMD_MODIFY_NO "Zadanie nie zmodyfikowane." -#define STRING_CMD_MODIFY_CONFIRM "Zmienić zadanie {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "To zadanie jest cykliczne. Czy chcesz zmodyfikować kolejne zadania w cyklu?" -#define STRING_CMD_MODIFY_NEED_TEXT "Należy podać tekst" -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "Wszystkie kolory, próbki lub legenda" #define STRING_CMD_COLOR_HERE "To są aktualnie używane kolory:" #define STRING_CMD_COLOR_COLOR "Kolor" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c93b16b9f..5498b955d 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -298,20 +298,6 @@ #define STRING_CMD_ZSHATTS_USAGE "Gera uma lista de todos os atributos, para terminação automática em zsh" #define STRING_CMD_ALIASES_USAGE "Gera uma lista com todos os 'alias', para fins de terminação automática" -#define STRING_CMD_MODIFY_USAGE1 "Modifica a tarefa existente com os argumentos indicados." -#define STRING_CMD_MODIFY_NO_DUE "Não pode criar tarefas recorrentes sem uma data de vencimento." -#define STRING_CMD_MODIFY_REM_DUE "Não pode remover a data de vencimento de uma tarefa recorrente." -#define STRING_CMD_MODIFY_REC_ALWAYS "Não pode remover o attributo de recorrência de uma tarefa recorrente." -#define STRING_CMD_MODIFY_TASK "A modificar a tarefa {1} '{2}'." -#define STRING_CMD_MODIFY_TASK_R "A modificar a tarefa recorrente {1} '{2}'." -#define STRING_CMD_MODIFY_1 "Modificada {1} tarefa." -#define STRING_CMD_MODIFY_N "Modificadas {1} tarefas." -#define STRING_CMD_MODIFY_NO "Tarefa não modificada." -#define STRING_CMD_MODIFY_CONFIRM "Modificar tarefa {1} '{2}'?" -#define STRING_CMD_MODIFY_RECUR "Esta é uma tarefa recorrente. Deseja modificar todas as recorrências pendentes da mesma?" -#define STRING_CMD_MODIFY_NEED_TEXT "É necessário fornecer mais informação." -#define STRING_CMD_MODIFY_INACTIVE "Note: Modified task {1} is {2}. You may wish to make this task pending with: task {3} modify status:pending" - #define STRING_CMD_COLOR_USAGE "Todas as cores, uma amostra ou a legenda" #define STRING_CMD_COLOR_HERE "Estas são as cores actualmente em uso:" #define STRING_CMD_COLOR_COLOR "Cor"