This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] [V3] gettextize some overlooked option arguments
On Fri, Mar 15, 2013, at 23:13, Roland McGrath wrote:
> [And before that I wrote:]
> > Oof, that was far down, and somewhat hard to find, but never mind.
>
> Improvements to the wiki are welcome.
Simplification of the constellation of hoops would be welcome too. :|
> You still put the log entry inside the diff, which is not what we do.
Oh dear... Okay, I've made the wiki a bit more clear about this.
> "[]" is not part of a variable name.
Sigh... Attached is version three.
> There is no context in which the construction you used seems like natural
> speech to a native English speaker.
Well, the patch is for foreigners only, so that's fine. :>
(I thought to have heard the glibc community had become more welcoming.
It don't look like it to me. You could take an example from the likes
of Jim Meyering and Karel Zak. If a patch is not entirely as they would
like it to be, they tweak it, check it in, done. Hooray! And only
afterwards they make a little comment about how to do it better next
time. Hat off to them.)
Benno
--
http://www.fastmail.fm - A fast, anti-spam email service.
2013-03-15 Benno Schulenberg <bensberg@justemail.net>
[BZ #14812]
* iconv/iconv_prog.c (options): Gettextize the option arguments.
* iconv/iconvconfig.c (options): Likewise.
From 0d4a02dbc37c22782d1e2cef730357ce632d0bd1 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.
---
iconv/iconv_prog.c | 6 +++---
iconv/iconvconfig.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
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