This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] [V2] gettextize some overlooked option arguments


On Fri, Mar 15, 2013, at 21:11, Roland McGrath wrote:
> Please see the guidelines on the wiki about how to post a patch and log
> entry, how to include the BZ# in the log entry,

Oof, that was far down, and somewhat hard to find, but never mind.

> and how to make each log
> entry sufficiently specific (naming the variable modified).

Okay, the attached second version should do it, then.

>  Aside from
> that log trivia (and a little awkward English: "Also verb the object" is
> more natural than "Verb also the object"), the change is perfectly fine.

Well, "also verb the object" means to me "also _verb the object, not just
frob it', whereas the intended meaning was "verb also the first object,
not just the last one".  But I've dropped the unneeded word.

Regards,

Benno

-- 
http://www.fastmail.fm - One of many happy users:
  http://www.fastmail.fm/help/overview_quotes.html

From a10c4458e6757bdc93807bccb2833bda898eb736 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 15 Mar 2013 20:14:44 +0100
Subject: [PATCH] Gettextize a few overlooked option arguments.

---
 ChangeLog           |    6 ++++++
 iconv/iconv_prog.c  |    6 +++---
 iconv/iconvconfig.c |    4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ef7625..7ffb6ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-15  Benno Schulenberg  <bensberg@justemail.net>
+
+	[BZ #14812]
+	* iconv/iconv_prog.c (options[]): Gettextize the option arguments.
+	* iconv/iconvconfig.c (options[]): Likewise.
+
 2013-03-15  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* math/libm-test.inc (ldexp_test): Add missing START/END markers.
diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c
index 4142020..91a29d1 100644
--- a/iconv/iconv_prog.c
+++ b/iconv/iconv_prog.c
@@ -57,13 +57,13 @@ void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
 static const struct argp_option options[] =
 {
   { NULL, 0, NULL, 0, N_("Input/Output format specification:") },
-  { "from-code", 'f', "NAME", 0, N_("encoding of original text") },
-  { "to-code", 't', "NAME", 0, N_("encoding for output") },
+  { "from-code", 'f', N_("NAME"), 0, N_("encoding of original text") },
+  { "to-code", 't', N_("NAME"), 0, N_("encoding for output") },
   { NULL, 0, NULL, 0, N_("Information:") },
   { "list", 'l', NULL, 0, N_("list all known coded character sets") },
   { NULL, 0, NULL, 0, N_("Output control:") },
   { NULL, 'c', NULL, 0, N_("omit invalid characters from output") },
-  { "output", 'o', "FILE", 0, N_("output file") },
+  { "output", 'o', N_("FILE"), 0, N_("write the output to this file") },
   { "silent", 's', NULL, 0, N_("suppress warnings") },
   { "verbose", OPT_VERBOSE, NULL, 0, N_("print progress information") },
   { NULL, 0, NULL, 0, NULL }
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 677620b..7e9ab48 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -123,8 +123,8 @@ static char *more_help (int key, const char *text, void *input);
 #define OPT_NOSTDLIB 301
 static const struct argp_option options[] =
 {
-  { "prefix", OPT_PREFIX, "PATH", 0, N_("Prefix used for all file accesses") },
-  { "output", 'o', "FILE", 0, N_("\
+  { "prefix", OPT_PREFIX, N_("PATH"), 0, N_("Prefix used for all file accesses") },
+  { "output", 'o', N_("FILE"), 0, N_("\
 Put output in FILE instead of installed location\
  (--prefix does not apply to FILE)") },
   { "nostdlib", OPT_NOSTDLIB, NULL, 0,
-- 
1.7.0.4


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]