From 6b0cfeb6501a0d89af7b68b667c8a40815d6e125 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 12 Nov 2009 18:13:02 +0100 Subject: lib/Plugins/Mailx.cpp,TicketUploader.cpp: simplify (-7k) Signed-off-by: Denys Vlasenko --- lib/Plugins/TicketUploader.cpp | 45 ++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 13 deletions(-) (limited to 'lib/Plugins/TicketUploader.cpp') diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 76bda40..081ff8f 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -295,28 +295,47 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport, } // generate a reciept telling md5sum and encryption key - ostringstream msgbuf; + // note: do not internationalize these strings! + string msg; if (have_ticket_name) - msgbuf << _("Please copy this into ticket: ") << ticket_name << endl; + { + msg += "Please copy this into ticket: "; + msg += ticket_name; + msg += '\n'; + } else - msgbuf << _("Please send this to your technical support: ") << endl; + { + msg += "Please send this to your technical support:\n"; + } if (do_upload) - msgbuf << _("RHUPLOAD: This report was sent to ") + upload_url << endl; + { + msg += "RHUPLOAD: This report was sent to "; + msg += upload_url; + msg += '\n'; + } else - msgbuf << _("RHUPLOAD: This report was copied into /tmp/: ") << endl; + { + msg += "RHUPLOAD: This report was copied into /tmp/:\n"; + } if (have_ticket_name) - msgbuf << _("TICKET: ") << ticket_name << endl; - msgbuf << _("FILE: ") << outfile_basename << endl; - msgbuf << _("MD5SUM: ") << endl; - msgbuf << md5sum; + { + msg += "TICKET: "; + msg += ticket_name; + msg += '\n'; + } + msg += "FILE: "; + msg += outfile_basename; + msg += "\nMD5SUM:\n"; + msg += md5sum; if (do_encrypt) { - msgbuf << _("KEY: aes-128-cbc") << endl; - msgbuf << key; + msg += "KEY: aes-128-cbc\n"; + msg += key; } - msgbuf << _("END: ") << endl; + msg += "END:\n"; - error_msg("%s", msgbuf.str().c_str()); + /* warn the client: */ + error_msg("%s", msg.c_str()); string ret; if (do_upload) -- cgit From 0e0aa3788dc3f2bf91f566fee6b695d0cd9939f4 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 13 Nov 2009 14:27:34 +0100 Subject: make plugin descriptions more consistent in style Signed-off-by: Denys Vlasenko --- lib/Plugins/TicketUploader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Plugins/TicketUploader.cpp') diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 081ff8f..847efdc 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -419,7 +419,7 @@ PLUGIN_INFO(REPORTER, CTicketUploader, "TicketUploader", "0.0.1", - "input ticket# and customer name from user, send report to FTP", + "Asks ticket# and customer name from user, sends report to FTP", "gavin@redhat.com", - "https://fedorahosted.org/abtr/wiki", + "https://fedorahosted.org/abrt/wiki", PLUGINS_LIB_DIR"/TicketUploader.GTKBuilder"); -- cgit