From 66c303daefbf7e05d0b55d1ccd2dc61f6aa2f233 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Mon, 10 Nov 2014 23:55:38 -0500 Subject: [PATCH] CLI - Removed inverted range error, and instead the parser just downgrades from an ID range to unknown. --- src/CLI.cpp | 5 ++++- 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/pol-POL.h | 1 - src/l10n/por-PRT.h | 1 - 8 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/CLI.cpp b/src/CLI.cpp index e93097d86..8d5e3110a 100644 --- a/src/CLI.cpp +++ b/src/CLI.cpp @@ -1379,7 +1379,10 @@ void CLI::findIDs () n_max.depleted ()) { if (id_min > id_max) - throw std::string (STRING_PARSER_RANGE_INVERTED); + { + is_an_id = false; + break; + } ranges.push_back (std::pair (id_min, id_max)); } diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 84dcdcbba..3238e25db 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Nested alias limit of {1} reached." #define STRING_PARSER_OVERRIDE_RC "Configuration override rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Error: unrecognized attribute modifier '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Inverted range 'high-low' instead of 'low-high'" #define STRING_PARSER_UUID_AFTER_COMMA "Unrecognized UUID after comma." #define STRING_PARSER_ALTERNATE_RC "Using alternate .taskrc file {1}" #define STRING_PARSER_ALTERNATE_DATA "Using alternate data.location {1}" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 4adfe4494..10a1d3603 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Atingis la limon de {1} nest-niveloj de alinomoj." #define STRING_PARSER_OVERRIDE_RC "Agorda superrego rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Eraro: nekonata atributa modifanto '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Atingopovo inversa 'maks-min' anstataŭ 'min-maks'" #define STRING_PARSER_UUID_AFTER_COMMA "Nekonata UUID-identigilo post komo." #define STRING_PARSER_ALTERNATE_RC "Uzanta alterna .taskrc-dosiero {1}" #define STRING_PARSER_ALTERNATE_DATA "Uzanta alterna data.location {1}" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index c01e5be13..dc4e1692f 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Límite de alias anidados ({1}) alcanzado." #define STRING_PARSER_OVERRIDE_RC "Sobrescritura de configuración rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Error: modificador de atributo no reconocido '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Rango invertido 'alto-bajo' en vez de 'bajo-alto'" #define STRING_PARSER_UUID_AFTER_COMMA "UUID no reconocido tras coma." #define STRING_PARSER_ALTERNATE_RC "Usando el archivo .taskrc alternativo {1}" #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 09d8e488c..cf7ad05ba 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Atteignit la limite d'amboîtage des pseudonymes, {1}." #define STRING_PARSER_OVERRIDE_RC "Configuration écrasée : rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Erreur : attribut de modification non reconnu '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Inverted range 'high-low' instead of 'low-high'" #define STRING_PARSER_UUID_AFTER_COMMA "UUID non reconnu après la virgule." #define STRING_PARSER_ALTERNATE_RC "Utilise un fichier .taskrc alternatif : {1}" #define STRING_PARSER_ALTERNATE_DATA "Utilise une data.location alternative : {1}" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 87af10a81..6c98b545d 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -106,7 +106,6 @@ #define STRING_PARSER_ALIAS_NEST "Nested alias limit of {1} reached." #define STRING_PARSER_OVERRIDE_RC "Modifica configurazione rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Errore: modificatore di attributo non riconosciuto '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Intervallo invertito 'alto-basso' invece di 'basso-alto'" #define STRING_PARSER_UUID_AFTER_COMMA "UUID non riconosciuto dopo la virgola." #define STRING_PARSER_ALTERNATE_RC "Uso del file .taskrc alternativo {1}" #define STRING_PARSER_ALTERNATE_DATA "Uso di data.location alternativa {1}" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 1a19e3287..811252d9f 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Limit {1} zagnieżdżonych aliasów osiągnięty" #define STRING_PARSER_OVERRIDE_RC "Nadpisanie konfiguracji rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Błąd: nierozpoznany atrybut '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Odwrócony zakres 'góra-dół' zamiast 'dół-góra'" #define STRING_PARSER_UUID_AFTER_COMMA "Nierozpoznany UUID po przecinku." #define STRING_PARSER_ALTERNATE_RC "Wczytanie alternatywnego pliku .taskrc {1}" #define STRING_PARSER_ALTERNATE_DATA "Alternatywne data.location {1}" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 16798289f..cf29a07c1 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -105,7 +105,6 @@ #define STRING_PARSER_ALIAS_NEST "Limite de 'alias' em cascata atingido: {1}" #define STRING_PARSER_OVERRIDE_RC "Alteração de configuração rc.{1}:{2}" #define STRING_PARSER_UNKNOWN_ATTMOD "Erro: modificador de atributo não reconhecido '{1}'." -#define STRING_PARSER_RANGE_INVERTED "Intervalo invertido 'alta-baixa' em vez de 'baixa-alta'" #define STRING_PARSER_UUID_AFTER_COMMA "UUID não reconhecido após a vírgula." #define STRING_PARSER_ALTERNATE_RC "Usando o ficheiro .taskrc alternativo {1}" #define STRING_PARSER_ALTERNATE_DATA "Usando data.location alternativa {1}"