diff --git a/src/Task.cpp b/src/Task.cpp index 210bc0685..3f0f81dec 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -1646,7 +1646,8 @@ void Task::validate (bool applyDefault /* = true */) Duration p; std::string::size_type i = 0; if (! p.parse (value, i)) - throw format (STRING_TASK_VALID_RECUR, value); + // TODO Ideal location to map unsupported old recurrence periods to supported values. + throw format ("The recurrence value '{1}' is not valid.", value); } } } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index cae7db4a2..7b26d49c6 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -687,7 +687,6 @@ #define STRING_TASK_VALID_BLANK "Leere Aufgaben können nicht angelegt werden." #define STRING_TASK_VALID_BEFORE "Warnung: Das '{1}'-Datum ist nach dem '{2}'-Datum." #define STRING_TASK_VALID_REC_DUE "Wiederholende Aufgaben müssen eine Fälligkeit besitzen." -#define STRING_TASK_VALID_RECUR "Wiederhol-Periode '{1}' ist ungültig." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Befehl an Ausführung gehindert." #define STRING_TASK_SAFETY_ALLOW "Kein Filter angegeben, und durch den konfigurierten 'allow.empty.filter'-Wert wurde keine Aktion durchgeführt." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 3a072a903..a0a5c0e77 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -684,7 +684,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_RECUR "The recurrence value '{1}' is not valid." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Command prevented from running." #define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 480d548f4..33b85c713 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -687,7 +687,6 @@ #define STRING_TASK_VALID_BLANK "Ne povas krei blankan taskon." #define STRING_TASK_VALID_BEFORE "Averto: Vi specifis daton '{1}' post dato '{2}'." #define STRING_TASK_VALID_REC_DUE "Reokazanta tasko devas ankaŭ havi daton 'due'." -#define STRING_TASK_VALID_RECUR "Reokaz-valoro '{1}' ne estas valida." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Antaŭmalebligis komandon." #define STRING_TASK_SAFETY_ALLOW "Vi ne specifis filtrilon. Laŭ la valoro 'allow.empty.filter', ne faros nenion." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index b500f8cad..5ea626298 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -699,7 +699,6 @@ #define STRING_TASK_VALID_BLANK "No se puede añadir una tarea que está en blanco." #define STRING_TASK_VALID_BEFORE "Advertencia: ha especificado que la fecha '{1}' es después de la fecha '{2}'." #define STRING_TASK_VALID_REC_DUE "Una tarea recurrente debe tener también una fecha de vencimiento." -#define STRING_TASK_VALID_RECUR "El valor de recurrencia '{1}' no es válido." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Se impidió la ejecución del comando." #define STRING_TASK_SAFETY_ALLOW "No especificó un filtro, y con el valor de 'allow.empty.filter', no se toma ninguna acción." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 01175e410..19843eda0 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -689,7 +689,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_RECUR "The recurrence value '{1}' is not valid." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Command prevented from running." #define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 8a0da1411..0a4de2151 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -688,7 +688,6 @@ #define STRING_TASK_VALID_BLANK "Impossibile aggiungere un task vuoto." #define STRING_TASK_VALID_BEFORE "Warning: data '{1}' con valore successivo alla data '{2}'." #define STRING_TASK_VALID_REC_DUE "Un task periodico deve avere una data di scadenza." -#define STRING_TASK_VALID_RECUR "Il valore di periodicità '{1}' non è valido." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Prevenuta l'esecuzione del comando." #define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index ac522d3b2..6e22afdac 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -689,7 +689,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_RECUR "The recurrence value '{1}' is not valid." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "コマンドの実行は中止された。" #define STRING_TASK_SAFETY_ALLOW "You did not specify a filter, and with the 'allow.empty.filter' value, no action is taken." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index d3dc3b4a1..e0247ab39 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -689,7 +689,6 @@ #define STRING_TASK_VALID_BLANK "Nie można dodać pustego zadania." #define STRING_TASK_VALID_BEFORE "Uwaga: podałeś datę '{1}' jako datę po '{2}'." #define STRING_TASK_VALID_REC_DUE "Zadanie cykliczne musi posiadać datę zakończenia." -#define STRING_TASK_VALID_RECUR "Wartość '{1}' określająca okres zadania jest niepoprawna." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Niedopuszczono do wykonania polecenia." #define STRING_TASK_SAFETY_ALLOW "Brak filtra, z aktywną flagą 'allow.empty.filter', nie podjęto akcji." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index fa07c825e..b1358d7da 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -689,7 +689,6 @@ #define STRING_TASK_VALID_BLANK "Não é possível adicionar uma tarefa em branco." #define STRING_TASK_VALID_BEFORE "Aviso: Especificou que a data de '{1}' é posterior à data de '{2}'." #define STRING_TASK_VALID_REC_DUE "Uma tarefa recorrente necessita de uma data de vencimento." -#define STRING_TASK_VALID_RECUR "O valor de recorrência '{1}' não é válido." #define STRING_TASK_SAFETY_VALVE "This command has no filter, and will modify all (including completed and deleted) tasks. Are you sure?" #define STRING_TASK_SAFETY_FAIL "Execução do comando abortada." #define STRING_TASK_SAFETY_ALLOW "Não especificou um filtro e com o valor de 'allow.empty.filter', nenhuma ação foi tomada." diff --git a/src/recur.cpp b/src/recur.cpp index 32a80b140..422cdbc8a 100644 --- a/src/recur.cpp +++ b/src/recur.cpp @@ -368,7 +368,7 @@ Datetime getNextRecurrence (Datetime& current, std::string& period) std::string::size_type idx = 0; Duration p; if (! p.parse (period, idx)) - throw std::string (format (STRING_TASK_VALID_RECUR, period)); + throw std::string (format ("The recurrence value '{1}' is not valid.", period)); return current + p.toTime_t (); }