From 4b75865e47e0751e4df63b1ccd083ab758ba9436 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 12:01:54 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_ADD_* --- src/commands/CmdAdd.cpp | 11 +++++------ src/commands/CmdDuplicate.cpp | 5 ++--- src/l10n/deu-DEU.h | 3 --- src/l10n/eng-USA.h | 3 --- src/l10n/epo-RUS.h | 3 --- src/l10n/esp-ESP.h | 3 --- src/l10n/fra-FRA.h | 3 --- src/l10n/ita-ITA.h | 3 --- src/l10n/jpn-JPN.h | 3 --- src/l10n/pol-POL.h | 3 --- src/l10n/por-PRT.h | 3 --- 11 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/commands/CmdAdd.cpp b/src/commands/CmdAdd.cpp index 45f250f7f..394f0cfbb 100644 --- a/src/commands/CmdAdd.cpp +++ b/src/commands/CmdAdd.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include extern Context context; @@ -38,7 +37,7 @@ CmdAdd::CmdAdd () { _keyword = "add"; _usage = "task add "; - _description = STRING_CMD_ADD_USAGE; + _description = "Adds a new task"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -67,20 +66,20 @@ int CmdAdd::execute (std::string& output) if (context.verbose ("new-uuid") && status != Task::recurring) - output += format (STRING_CMD_ADD_FEEDBACK, task.get ("uuid")) + '\n'; + output += format ("Created task {1}.\n", task.get ("uuid")); else if (context.verbose ("new-uuid") && status == Task::recurring) - output += format (STRING_CMD_ADD_RECUR, task.get ("uuid")) + '\n'; + output += format ("Created task {1} (recurrence template).\n", task.get ("uuid")); else if (context.verbose ("new-id") && (status == Task::pending || status == Task::waiting)) - output += format (STRING_CMD_ADD_FEEDBACK, task.id) + '\n'; + output += format ("Created task {1}.\n", task.id); else if (context.verbose ("new-id") && status == Task::recurring) - output += format (STRING_CMD_ADD_RECUR, task.id) + '\n'; + output += format ("Created task {1} (recurrence template).\n", task.id); if (context.verbose ("project")) context.footnote (onProjectChange (task)); diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp index eea1a6f7c..80ab5db47 100644 --- a/src/commands/CmdDuplicate.cpp +++ b/src/commands/CmdDuplicate.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include extern Context context; @@ -118,11 +117,11 @@ int CmdDuplicate::execute (std::string&) if (context.verbose ("new-id") && (status == Task::pending || status == Task::waiting)) - std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.id) + '\n'; + std::cout << format ("Created task {1}.\n", dup.id); else if (context.verbose ("new-uuid") && status != Task::recurring) - std::cout << format (STRING_CMD_ADD_FEEDBACK, dup.get ("uuid")) + '\n'; + std::cout << format ("Created task {1}.\n", dup.get ("uuid")); if (context.verbose ("project")) projectChanges[task.get ("project")] = onProjectChange (task); diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 4cbcbbdd9..22276136d 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Aufgabe {1} hinzugefügt." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Fügt eine neue Aufgabe hinzu" #define STRING_CMD_ALIASES_USAGE "Erzeugt eine Liste aller Aliase zur Auto-Vervollständigung" #define STRING_CMD_CAL_BAD_ARG "Konnte Argument '{1}' nicht erkennen." #define STRING_CMD_CAL_BAD_MONTH "Argument '{1}' ist kein zulässiger Monat." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index aaef8c256..be137f82a 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Created task {1}." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Adds a new task" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" #define STRING_CMD_CAL_BAD_ARG "Could not recognize argument '{1}'." #define STRING_CMD_CAL_BAD_MONTH "Argument '{1}' is not a valid month." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 7ccabfef6..dbd5adb35 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Kreis taskon {1}." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Kreas novan taskon" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" #define STRING_CMD_CAL_BAD_ARG "Ne povis rekoni argumenton '{1}'." #define STRING_CMD_CAL_BAD_MONTH "Argumento '{1}' ne estas valida monato." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 7a6db4f95..44f9b22bc 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Creada tarea {1}." -#define STRING_CMD_ADD_RECUR "Creada tarea {1} (modelo de recurrencia)." -#define STRING_CMD_ADD_USAGE "Añade una nueva tarea" #define STRING_CMD_ALIASES_USAGE "Genera una lista de todos los alias, con fines de auto-completado" #define STRING_CMD_CAL_BAD_ARG "No se pudo reconocer el argumento '{1}'." #define STRING_CMD_CAL_BAD_MONTH "El argumento '{1}' no es un mes válido." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 829089024..159d3273c 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Tâche {1} crée." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Ajoute une nouvelle tâche" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" #define STRING_CMD_CAL_BAD_ARG "Could not recognize argument '{1}'." #define STRING_CMD_CAL_BAD_MONTH "Argument '{1}' is not a valid month." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 8de2f2487..60bdfabe9 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Task {1} creato." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Aggiunge un nuovo task" #define STRING_CMD_ALIASES_USAGE "Genera la lista di tutti gli alias, per autocompletamento" #define STRING_CMD_CAL_BAD_ARG "Impossibile riconosce l'argomento '{1}'." #define STRING_CMD_CAL_BAD_MONTH "L'argomento '{1}' non è un mese valido." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 38df78ff5..c7126b05c 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "タスク {1} が生成されました。" -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "新しいタスクの追加" #define STRING_CMD_ALIASES_USAGE "Generates a list of all aliases, for autocompletion purposes" #define STRING_CMD_CAL_BAD_ARG "引数'{1}' を認識できません。" #define STRING_CMD_CAL_BAD_MONTH "引数 '{1}' は正しい月ではありません。" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 24e590880..57f629a3e 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Utworzono zadanie {1}." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Dodaje nowe zadanie" #define STRING_CMD_ALIASES_USAGE "Generuje listę wszystkich aliasów dla funkcji autouzupełniania" #define STRING_CMD_CAL_BAD_ARG "Nie rozpoznany argument '{1}'." #define STRING_CMD_CAL_BAD_MONTH "Argument '{1}' nie jest poprawnym miesiącem" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index a0de2d16b..27790af8d 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -27,9 +27,6 @@ #ifndef INCLUDED_STRINGS #define INCLUDED_STRINGS -#define STRING_CMD_ADD_FEEDBACK "Criada a tarefa {1}." -#define STRING_CMD_ADD_RECUR "Created task {1} (recurrence template)." -#define STRING_CMD_ADD_USAGE "Adiciona uma nova tarefa" #define STRING_CMD_ALIASES_USAGE "Gera uma lista com todos os 'alias', para fins de terminação automática" #define STRING_CMD_CAL_BAD_ARG "Não foi possível reconhecer o argumento '{1}'." #define STRING_CMD_CAL_BAD_MONTH "Argumento '{1}' não é um mês válido."