From 9188cb083c5040fb9ad5dd6fb3a67fea3fa515c3 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 21 Jan 2018 12:09:51 -0500 Subject: [PATCH] l10n: Eliminated STRING_CMD_IMPORT_* --- src/Task.cpp | 2 +- src/commands/CmdImport.cpp | 11 +++++------ src/l10n/deu-DEU.h | 5 ----- src/l10n/eng-USA.h | 5 ----- src/l10n/epo-RUS.h | 5 ----- src/l10n/esp-ESP.h | 5 ----- src/l10n/fra-FRA.h | 5 ----- src/l10n/ita-ITA.h | 5 ----- src/l10n/jpn-JPN.h | 5 ----- src/l10n/pol-POL.h | 5 ----- src/l10n/por-PRT.h | 5 ----- 11 files changed, 6 insertions(+), 52 deletions(-) diff --git a/src/Task.cpp b/src/Task.cpp index ead660701..27d9366cd 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -1506,7 +1506,7 @@ void Task::validate (bool applyDefault /* = true */) std::string token; Lexer::Type type; if (! lex.isUUID (token, type, true)) - throw format (STRING_CMD_IMPORT_UUID_BAD, uid); + throw format ("Not a valid UUID '{1}'.", uid); } else set ("uuid", uuid ()); diff --git a/src/commands/CmdImport.cpp b/src/commands/CmdImport.cpp index 100f5e354..7ca2f2a82 100644 --- a/src/commands/CmdImport.cpp +++ b/src/commands/CmdImport.cpp @@ -32,7 +32,6 @@ #include #include #include -#include extern Context context; @@ -41,7 +40,7 @@ CmdImport::CmdImport () { _keyword = "import"; _usage = "task import [ ...]"; - _description = STRING_CMD_IMPORT_USAGE; + _description = "Imports JSON files"; _read_only = false; _displays_id = false; _needs_gc = false; @@ -63,7 +62,7 @@ int CmdImport::execute (std::string&) if (! words.size () || (words.size () == 1 && words[0] == "-")) { - std::cout << format (STRING_CMD_IMPORT_FILE, "STDIN") << '\n'; + std::cout << format ("Importing '{1}'\n", "STDIN"); std::string json; std::string line; @@ -80,9 +79,9 @@ int CmdImport::execute (std::string&) { File incoming (word); if (! incoming.exists ()) - throw format (STRING_CMD_IMPORT_MISSING, word); + throw format ("File '{1}' not found.", word); - std::cout << format (STRING_CMD_IMPORT_FILE, word) << '\n'; + std::cout << format ("Importing '{1}'\n", word); // Load the file. std::string json; @@ -92,7 +91,7 @@ int CmdImport::execute (std::string&) } } - context.footnote (format (STRING_CMD_IMPORT_SUMMARY, count)); + context.footnote (format ("Imported {1} tasks.", count)); return rc; } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 4eef7f7c7..013b5fcad 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Zeigt die IDs passender Aufgaben als Liste" #define STRING_CMD_IDS_USAGE_RANGE "Zeigt die IDs passender Aufgaben als Folge" #define STRING_CMD_IDS_USAGE_ZSH "Zeigt die IDs und Beschreibungen passender Aufgaben" -#define STRING_CMD_IMPORT_FILE "Importiere '{1}'" -#define STRING_CMD_IMPORT_MISSING "Datei '{1}' nicht gefunden." -#define STRING_CMD_IMPORT_SUMMARY "{1} Aufgabe importiert." -#define STRING_CMD_IMPORT_USAGE "Importiert eine JSON-Datei" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "Aufgabe blockiert durch" #define STRING_CMD_INFO_BLOCKING "Aufgabe blockiert" #define STRING_CMD_INFO_MODIFICATION "Änderung" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index c2d80ca69..c871cf4ca 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Shows the IDs of matching tasks, in the form of a list" #define STRING_CMD_IDS_USAGE_RANGE "Shows the IDs of matching tasks, as a range" #define STRING_CMD_IDS_USAGE_ZSH "Shows the IDs and descriptions of matching tasks" -#define STRING_CMD_IMPORT_FILE "Importing '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." -#define STRING_CMD_IMPORT_USAGE "Imports JSON files" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "This task blocked by" #define STRING_CMD_INFO_BLOCKING "This task is blocking" #define STRING_CMD_INFO_MODIFICATION "Modification" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 2bacfe20f..36ddd1f42 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Montras la identigilon de ĉia kongruanta tasko, kiel listo" #define STRING_CMD_IDS_USAGE_RANGE "Montras la identigilon de ĉia kongruanta tasko, kiel atingopovo" #define STRING_CMD_IDS_USAGE_ZSH "Montras la identigilon kaj la priskribon de ĉia kongruanta tasko" -#define STRING_CMD_IMPORT_FILE "Importanta '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Importis {1} taskojn." -#define STRING_CMD_IMPORT_USAGE "Importas JSON-dosierojn" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "Tiu tasko blokata per" #define STRING_CMD_INFO_BLOCKING "Tiu tasko blokas" #define STRING_CMD_INFO_MODIFICATION "Modifado" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 031ccc89c..0f67b0c3a 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Muestra los IDs de las tareas coincidentes, en forma de lista" #define STRING_CMD_IDS_USAGE_RANGE "Muestra los IDs de las tareas coincidentes, como un rango" #define STRING_CMD_IDS_USAGE_ZSH "Muestra los IDs y descripciones de las tareas coincidentes" -#define STRING_CMD_IMPORT_FILE "Importando '{1}'" -#define STRING_CMD_IMPORT_MISSING "Archivo '{1}' no encontrado." -#define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tareas." -#define STRING_CMD_IMPORT_USAGE "Importa archivos JSON" -#define STRING_CMD_IMPORT_UUID_BAD "UUID '{1}' no válido." #define STRING_CMD_INFO_BLOCKED "Esta tarea está bloqueada por" #define STRING_CMD_INFO_BLOCKING "Esta tarea bloquea" #define STRING_CMD_INFO_MODIFICATION "Modificación" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index fe796d968..579df3919 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Affiche les IDs des tâches correspondantes, sous forme de liste" #define STRING_CMD_IDS_USAGE_RANGE "Affiche les IDs des tâches correspondantes, comme une plage" #define STRING_CMD_IDS_USAGE_ZSH "Affiche les IDs et les descriptions des tâches correspondantes" -#define STRING_CMD_IMPORT_FILE "Importing '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Imported {1} tasks." -#define STRING_CMD_IMPORT_USAGE "Imports JSON files" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "Cette tâche est bloquée par" #define STRING_CMD_INFO_BLOCKING "Cette tâche bloque" #define STRING_CMD_INFO_MODIFICATION "Modification" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index cb7d337d9..0f577e7fc 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Mostra gli ID dei task corrispondenti, in forma di lista" #define STRING_CMD_IDS_USAGE_RANGE "Mostra gli ID dei task corrispondenti, come intervallo" #define STRING_CMD_IDS_USAGE_ZSH "Mostra gli ID e le descrizioni dei task corrispondenti" -#define STRING_CMD_IMPORT_FILE "Importazione di '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Importati {1} task." -#define STRING_CMD_IMPORT_USAGE "Importa file JSON" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "Questo task è bloccato da" #define STRING_CMD_INFO_BLOCKING "Questo task sta bloccando" #define STRING_CMD_INFO_MODIFICATION "Modifica" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 8e1ee7b6f..20bfcc5bc 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Shows the IDs of matching tasks, in the form of a list" #define STRING_CMD_IDS_USAGE_RANGE "Shows the IDs of matching tasks, as a range" #define STRING_CMD_IDS_USAGE_ZSH "Shows the IDs and descriptions of matching tasks" -#define STRING_CMD_IMPORT_FILE "'{1}' をインポート中" -#define STRING_CMD_IMPORT_MISSING "ファイル '{1}' が見つかりません。" -#define STRING_CMD_IMPORT_SUMMARY "{1} task をインポートしました。" -#define STRING_CMD_IMPORT_USAGE "JSON ファイルをインポート" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "This task blocked by" #define STRING_CMD_INFO_BLOCKING "This task is blocking" #define STRING_CMD_INFO_MODIFICATION "Modification" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index f06424d0e..6997b13e5 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Pokazuje IDki pasujących zadań, w formie listy" #define STRING_CMD_IDS_USAGE_RANGE "Pokazuje IDki pasujących zadań, w formie zakresu" #define STRING_CMD_IDS_USAGE_ZSH "Pokazuje IDki i opisy pasujących zadań" -#define STRING_CMD_IMPORT_FILE "Importowanie '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Zaimportowano {1} zadań." -#define STRING_CMD_IMPORT_USAGE "Importuje pliki JSON" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "To zadanie jest blokowane przez" #define STRING_CMD_INFO_BLOCKING "To zadanie blokuje" #define STRING_CMD_INFO_MODIFICATION "Modyfikacja" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index ee2e562fa..a3ef5471c 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -46,11 +46,6 @@ #define STRING_CMD_IDS_USAGE_LIST "Exibe em formato de lista, os IDs das tarefas correspondentes" #define STRING_CMD_IDS_USAGE_RANGE "Exibe como intervalo, os IDs das tarefas correspondentes" #define STRING_CMD_IDS_USAGE_ZSH "Exibe os IDs e descrições das tarefas correspondentes" -#define STRING_CMD_IMPORT_FILE "A importar '{1}'" -#define STRING_CMD_IMPORT_MISSING "File '{1}' not found." -#define STRING_CMD_IMPORT_SUMMARY "Importadas {1} tarefas." -#define STRING_CMD_IMPORT_USAGE "Importa ficheiros JSON" -#define STRING_CMD_IMPORT_UUID_BAD "Not a valid UUID '{1}'." #define STRING_CMD_INFO_BLOCKED "Esta tarefa está bloqueada por" #define STRING_CMD_INFO_BLOCKING "Esta tarefa bloqueia" #define STRING_CMD_INFO_MODIFICATION "Modificação"