From 59ccad5b62cb08193645afe321c23ec3907d75d0 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 1 Jul 2011 22:33:49 -0400 Subject: [PATCH] I18N - Localized more files. --- src/commands/CmdSummary.cpp | 29 +++++++++++++++++++---------- src/en-US.h | 5 +++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 40d9c8412..87f16a7a7 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -25,12 +25,15 @@ // //////////////////////////////////////////////////////////////////////////////// +#define L10N // Localization complete. + #include #include #include #include #include #include +#include #include #include @@ -41,7 +44,7 @@ CmdSummary::CmdSummary () { _keyword = "summary"; _usage = "task summary"; - _description = "Shows a report of task status by project."; + _description = STRING_CMD_SUMMARY_USAGE; _read_only = true; _displays_id = false; } @@ -120,10 +123,10 @@ int CmdSummary::execute (std::string& output) // Create a table for output. ViewText view; view.width (context.getWidth ()); - view.add (Column::factory ("string", "Project")); - view.add (Column::factory ("string.right", "Remaining")); - view.add (Column::factory ("string.right", "Avg age")); - view.add (Column::factory ("string.right", "Complete")); + view.add (Column::factory ("string", STRING_CMD_SUMMARY_PROJECT)); + view.add (Column::factory ("string.right", STRING_CMD_SUMMARY_REMAINING)); + view.add (Column::factory ("string.right", STRING_CMD_SUMMARY_AVG_AGE)); + view.add (Column::factory ("string.right", STRING_CMD_SUMMARY_COMPLETE)); view.add (Column::factory ("string", "0% 100%")); Color bar_color (context.config.get ("color.summary.bar")); @@ -167,14 +170,20 @@ int CmdSummary::execute (std::string& output) std::stringstream out; if (view.rows ()) + { out << optionalBlankLine () << view.render () - << optionalBlankLine () - << view.rows () - << (view.rows () == 1 ? " project" : " projects") - << "\n"; + << optionalBlankLine (); + + if (view.rows ()) + out << format (STRING_CMD_PROJECTS_SUMMARY2, view.rows ()); + else + out << STRING_CMD_PROJECTS_SUMMARY; + + out << "\n"; + } else { - out << "No projects.\n"; + out << STRING_CMD_PROJECTS_NO << "\n"; rc = 1; } diff --git a/src/en-US.h b/src/en-US.h index 118527dac..02f72be68 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -248,6 +248,11 @@ #define STRING_CMD_PROJECTS_SUMMARY2 "{1} projects" #define STRING_CMD_PROJECTS_TASK "({1} task)" #define STRING_CMD_PROJECTS_TASKS "({1} tasks)" +#define STRING_CMD_SUMMARY_USAGE "Shows a report of task status by project." +#define STRING_CMD_SUMMARY_PROJECT "Project" +#define STRING_CMD_SUMMARY_REMAINING "Remaining" +#define STRING_CMD_SUMMARY_AVG_AGE "Avg age" +#define STRING_CMD_SUMMARY_COMPLETE "Complete" // Config #define STRING_CONFIG_OVERNEST "Configuration file nested to more than 10 levels deep - this has to be a mistake."