From 0bccab3779a2185ccfd738cb44b9050b7b05746c Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 1 Aug 2009 19:38:22 +0200 Subject: [PATCH] Consolidate translatable strings into a common form. Be kind to the translators and reduce the number of distinct strings they have to translate. --- src/output/cairo.c | 4 ++-- src/output/odt.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/output/cairo.c b/src/output/cairo.c index b8fc486e..a2d5fef9 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -389,8 +389,8 @@ handle_option (void *options_, const char *key, const struct string *val) { case -1: error (0, 0, - _("unknown configuration parameter `%s' for Cairo device " - "driver"), key); + _("unknown configuration parameter `%s' for %s device " + "driver"), key, this->class->name); break; case output_file_arg: free (options->file_name); diff --git a/src/output/odt.c b/src/output/odt.c index 7c87a370..5c0bee8e 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -46,6 +46,8 @@ struct odf_driver_options { + struct outp_driver *driver; + char *file_name; /* Output file name. */ bool debug; }; @@ -283,6 +285,7 @@ static bool handle_option (void *options_, const char *key, const struct string *val) { struct odf_driver_options *options = options_; + struct outp_driver *this = options->driver; int subcat; char *value = ds_cstr (val); @@ -290,8 +293,8 @@ handle_option (void *options_, const char *key, const struct string *val) { case -1: error (0, 0, - _("unknown configuration parameter `%s' for ODF device " - "driver"), key); + _("unknown configuration parameter `%s' for %s device " + "driver"), key, this->class->name); break; case output_file_arg: free (options->file_name); @@ -327,6 +330,7 @@ odt_open_driver (const char *name, int types, struct substring option_string) this->ext = x = xmalloc (sizeof *x); + x->opts.driver = this; x->opts.file_name = xstrdup ("pspp.pdt"); x->opts.debug = false; -- 2.30.2