From 3f14491e31431b3153fc01a9ad5c83499963084e Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 7 Jan 2018 13:10:52 -0500 Subject: [PATCH] l10n removal of STRING_UDA_NUMERIC --- src/columns/ColTypeNumeric.cpp | 3 +-- src/commands/CmdEdit.cpp | 2 +- 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, 2 insertions(+), 12 deletions(-) diff --git a/src/columns/ColTypeNumeric.cpp b/src/columns/ColTypeNumeric.cpp index 63db93260..5d72a269f 100644 --- a/src/columns/ColTypeNumeric.cpp +++ b/src/columns/ColTypeNumeric.cpp @@ -31,7 +31,6 @@ #include #include #include -#include extern Context context; extern Task& contextTask; @@ -72,7 +71,7 @@ void ColumnTypeNumeric::modify (Task& task, const std::string& value) // If the result is not readily convertible to a numeric value, then this is // an error. if (evaluatedValue.type () == Variant::type_string) - throw format (STRING_UDA_NUMERIC, evaluatedValue.get_string ()); + throw format ("The value '{1}' is not a valid numeric value.", evaluatedValue.get_string ()); task.set (_name, evaluatedValue); } diff --git a/src/commands/CmdEdit.cpp b/src/commands/CmdEdit.cpp index adc61145d..eb9149bb3 100644 --- a/src/commands/CmdEdit.cpp +++ b/src/commands/CmdEdit.cpp @@ -681,7 +681,7 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string pig.eos ()) task.set (col.first, value); else - throw format (STRING_UDA_NUMERIC, value); + throw format ("The value '{1}' is not a valid numeric value.", value); } else if (type == "date") { diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 896b03ef3..03055a9b1 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -703,7 +703,6 @@ #define STRING_ASSUME_INFO "Kein Befehl angegeben - nehme 'information' an." #define STRING_INFINITE_LOOP "Beende Ersetzung, weil mehr als {1} Änderungen durchgeführt wurden - Schutz vor Endlosschleifen." #define STRING_UDA_TYPE "UDAs müssen vom Typ 'string', 'date', 'duration' oder 'numeric' sein." -#define STRING_UDA_NUMERIC "Der Wert '{1}' ist kein zulässiger Zahlenwert." #define STRING_UDA_COLLISION "Das UDA '{1}' hat den selben Namen wie eine eingebaute Eigenschaft, und ist daher nicht erlaubt." #define STRING_INVALID_MOD "Die '{1}'-Eigenschaft erlaubt keinen Wert '{2}'." #define STRING_INVALID_SORT_COL "Nach Spalte '{1}' kann nicht sortiert weden." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 49315b12c..22c31daec 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -701,7 +701,6 @@ #define STRING_ASSUME_INFO "No command specified - assuming 'information'." #define STRING_INFINITE_LOOP "Terminated substitution because more than {1} changes were made - infinite loop protection." #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." -#define STRING_UDA_NUMERIC "The value '{1}' is not a valid numeric value." #define STRING_UDA_COLLISION "The UDA named '{1}' is the same as a core attribute, and is not permitted." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_INVALID_SORT_COL "The '{1}' column is not a valid sort field." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 5e16dccf8..9da28c3a3 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -703,7 +703,6 @@ #define STRING_ASSUME_INFO "Nenia komando specifita. Supozanta 'information'." #define STRING_INFINITE_LOOP "Finis anstataŭon ĉar ekzistas pli de {1} ŝanĝoj - protekto kontraŭ senfina ripeton." #define STRING_UDA_TYPE "La tipo de uzanto-definitaj atributoj devas esti 'string', 'date', 'duration', aŭ 'numeric'." -#define STRING_UDA_NUMERIC "Valoro '{1}' ne estas valida nombra valoro." #define STRING_UDA_COLLISION "UDA '{1}' kaj enkonstruita atributo havas la saman nomon. Tio estas malpermesita." #define STRING_INVALID_MOD "Atributo '{1}' ne permesas valoron '{2}'." #define STRING_INVALID_SORT_COL "Kolumno '{1}' ne estas valida kampo por ordigi." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index a2adea6a8..4a775a712 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -715,7 +715,6 @@ #define STRING_ASSUME_INFO "No especificó un comando - asumido 'information'." #define STRING_INFINITE_LOOP "Sustitución terminada debido a que se hicieron más de {1} cambios - protección contra ciclo eterno." #define STRING_UDA_TYPE "Los atributos definidos por el usuario solamente pueden ser de los tipos 'string', 'date', 'duration' o 'numeric'." -#define STRING_UDA_NUMERIC "El valor '{1}' no es un valor numérico válido." #define STRING_UDA_COLLISION "El UDA denominado '{1}' es el mismo que un atributo del núcleo, y no está permitido." #define STRING_INVALID_MOD "El atributo '{1}' no admite un valor '{2}'." #define STRING_INVALID_SORT_COL "La columna '{1}' no es un campo de ordenación válido." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 3b5197b06..5bdf9c5ae 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -705,7 +705,6 @@ #define STRING_ASSUME_INFO "No command specified - assuming 'information'." #define STRING_INFINITE_LOOP "Substitution arrêté parce que plus de {1} changements ont été faits - protection contre les boucles infinies." #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." -#define STRING_UDA_NUMERIC "The value '{1}' is not a valid numeric value." #define STRING_UDA_COLLISION "L'ADU nommé '{1}' est le même qu'un attribut du noyau, et ce n'est pas autorisé." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_INVALID_SORT_COL "The '{1}' column is not a valid sort field." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 2e4c515e4..b8d7e6956 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -704,7 +704,6 @@ #define STRING_ASSUME_INFO "Nessun comando specificato - si assume 'information'." #define STRING_INFINITE_LOOP "Sostituzione terminata poiché più di {1} modifiche sono state fatte - protezione da ciclo infinito" #define STRING_UDA_TYPE "Gli User defined attribute possono solo essere di tipo 'string', 'date', 'duration' o 'numeric'." -#define STRING_UDA_NUMERIC "Il valore '{1}' non è un valore numerico valido." #define STRING_UDA_COLLISION "L'UDA '{1}' ha lo stesso nome di un attributo di sistema, e ciò non è permesso." #define STRING_INVALID_MOD "L'attributo '{1}' non ammette un valore pari a '{2}'." #define STRING_INVALID_SORT_COL "La colonna '{1}' non è un campo di ordinamento valido." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 102f400e5..2f0d6238e 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -705,7 +705,6 @@ #define STRING_ASSUME_INFO "コマンドが指定されていません - 'information' を仮定します。" #define STRING_INFINITE_LOOP "Terminated substitution because more than {1} changes were made - infinite loop protection." #define STRING_UDA_TYPE "User defined attributes may only be of type 'string', 'date', 'duration' or 'numeric'." -#define STRING_UDA_NUMERIC "The value '{1}' is not a valid numeric value." #define STRING_UDA_COLLISION "The UDA named '{1}' is the same as a core attribute, and is not permitted." #define STRING_INVALID_MOD "The '{1}' attribute does not allow a value of '{2}'." #define STRING_INVALID_SORT_COL "The '{1}' column is not a valid sort field." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index cdc5e78cf..daf77e345 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -705,7 +705,6 @@ #define STRING_ASSUME_INFO "Nie podano polecenia - zakładam 'information'." #define STRING_INFINITE_LOOP "Podstawienie anulowane ponieważ wykonano więcej niż {1} zmian - zabezpieczenie przed zapętleniem." #define STRING_UDA_TYPE "Atrybuty definiowane przez użytkownika mogą być typu 'string', 'date', 'duration' lub 'numeric'." -#define STRING_UDA_NUMERIC "Wartość '{1}' nie jest poprawną wartością numeryczną." #define STRING_UDA_COLLISION "Nazwa UDA '{1}' jest jedną z nazw atrybutów podstawowych i dlatego jest niedozwolona." #define STRING_INVALID_MOD "Atrybut '{1}' nie zezwala na wartość '{2}'." #define STRING_INVALID_SORT_COL "Kolumna '{1}' nie jest poprawnym parametrem sortowania." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 2175abf51..f7c6e38ab 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -705,7 +705,6 @@ #define STRING_ASSUME_INFO "Nenhum comando especificado - assumindo 'information'." #define STRING_INFINITE_LOOP "Substituição terminada. Efectuadas mais de {1} alterações - protecção de ciclos infinitos." #define STRING_UDA_TYPE "Atributos definidos pelo utilizador (UDAs) apenas podem ser do tipo 'texto', 'data', 'duração' ou 'numérico'." -#define STRING_UDA_NUMERIC "O valor '{1}' não é um valor numérico válido." #define STRING_UDA_COLLISION "O UDA '{1}' tem o mesmo nome que um atributo interno, tal não é permitido." #define STRING_INVALID_MOD "O atributo '{1}' não permite o valor '{2}'." #define STRING_INVALID_SORT_COL "A coluna '{1}' não pode ser ordenada."