From ead5322340dedc1c418bd627077b1c25f341790d Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 20 Jan 2018 14:30:03 -0500 Subject: [PATCH] l10n: Eliminated STRING_INVALID_MOD --- src/Task.cpp | 2 +- src/columns/ColTypeString.cpp | 3 ++- src/l10n/deu-DEU.h | 1 - src/l10n/eng-USA.h | 1 - src/l10n/epo-RUS.h | 1 - src/l10n/esp-ESP.h | 1 - src/l10n/fra-FRA.h | 1 - src/l10n/ita-ITA.h | 1 - src/l10n/jpn-JPN.h | 1 - src/l10n/pol-POL.h | 1 - src/l10n/por-PRT.h | 1 - 11 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Task.cpp b/src/Task.cpp index 8981bb6c7..361d14bfa 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -2083,7 +2083,7 @@ void Task::modify (modType type, bool text_required /* = false */) Column* column = context.columns[name]; if (! column || ! column->modifiable ()) - throw format (STRING_INVALID_MOD, name, value); + throw format ("The '{1}' attribute does not allow a value of '{2}'.", name, value); // Delegate modification to the column object or their base classes. if (name == "depends" || diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp index 4725b89d1..0b1a79771 100644 --- a/src/columns/ColTypeString.cpp +++ b/src/columns/ColTypeString.cpp @@ -31,7 +31,8 @@ #include #include #include -#include + +#define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." extern Context context; extern Task& contextTask; diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 4bd2f36e6..2723042ca 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -471,7 +471,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'." #define STRING_ERROR_DETAILS "Die Option 'calendar.details.report' muss einen einzelnen Report-Namen enthalten." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index eae416122..44d08ae02 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -468,7 +468,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 6059aba87..bccec8723 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -471,7 +471,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "Atributo '{1}' ne permesas valoron '{2}'." #define STRING_ERROR_DETAILS "Agordo 'calendar.details.report' devas enhavi sole unu raportnomon." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 6d15d8683..2a8904eee 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -483,7 +483,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "El atributo '{1}' no admite un valor '{2}'." #define STRING_ERROR_DETAILS "El ajuste 'calendar.details.report' debe contener un único nombre de informe." #define STRING_ERROR_NO_FILTER "Los filtros de línea de comando no están soportados por este comando." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 841be01a1..4f7c03352 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -493,7 +493,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 97dae78a3..1186b9b78 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -472,7 +472,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "L'attributo '{1}' non ammette un valore pari a '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 36864266d..c37ee2f96 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -473,7 +473,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_ERROR_DETAILS "The setting 'calendar.details.report' must contain a single report name." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index d990c58af..f2d40d091 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -473,7 +473,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "Atrybut '{1}' nie zezwala na wartość '{2}'." #define STRING_ERROR_DETAILS "Zmienna 'calendar.details.report' musi zawierać nazwę raportu." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index f946dfcea..5f301ab4c 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -473,7 +473,6 @@ // Errors // TODO Move each of these to appropriate section. -#define STRING_INVALID_MOD "O atributo '{1}' não permite o valor '{2}'." #define STRING_ERROR_DETAILS "A definição 'calendar.details.report' pode apenas indicar um nome de relatório." #define STRING_ERROR_NO_FILTER "Command line filters are not supported by this command."