From: Jeff King <peff@peff.net>
To: bs.x.ttp@recursor.net
Cc: git@vger.kernel.org
Subject: [PATCH 1/4] ident: mark error messages for translation
Date: Thu, 23 Feb 2017 03:12:30 -0500 [thread overview]
Message-ID: <20170223081230.4u4xpebfhmr2h4gk@sigill.intra.peff.net> (raw)
In-Reply-To: <20170223081157.hwfn3msfux5udmng@sigill.intra.peff.net>
We already translate the big "please tell me who you are"
hint, but missed the individual error messages that go with
it.
Signed-off-by: Jeff King <peff@peff.net>
---
ident.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ident.c b/ident.c
index ac4ae02b4..dde82983a 100644
--- a/ident.c
+++ b/ident.c
@@ -357,13 +357,13 @@ const char *fmt_ident(const char *name, const char *email,
if (strict && ident_use_config_only
&& !(ident_config_given & IDENT_NAME_GIVEN)) {
fputs(_(env_hint), stderr);
- die("no name was given and auto-detection is disabled");
+ die(_("no name was given and auto-detection is disabled"));
}
name = ident_default_name();
using_default = 1;
if (strict && default_name_is_bogus) {
fputs(_(env_hint), stderr);
- die("unable to auto-detect name (got '%s')", name);
+ die(_("unable to auto-detect name (got '%s')"), name);
}
}
if (!*name) {
@@ -371,7 +371,7 @@ const char *fmt_ident(const char *name, const char *email,
if (strict) {
if (using_default)
fputs(_(env_hint), stderr);
- die("empty ident name (for <%s>) not allowed", email);
+ die(_("empty ident name (for <%s>) not allowed"), email);
}
pw = xgetpwuid_self(NULL);
name = pw->pw_name;
@@ -382,12 +382,12 @@ const char *fmt_ident(const char *name, const char *email,
if (strict && ident_use_config_only
&& !(ident_config_given & IDENT_MAIL_GIVEN)) {
fputs(_(env_hint), stderr);
- die("no email was given and auto-detection is disabled");
+ die(_("no email was given and auto-detection is disabled"));
}
email = ident_default_email();
if (strict && default_email_is_bogus) {
fputs(_(env_hint), stderr);
- die("unable to auto-detect email address (got '%s')", email);
+ die(_("unable to auto-detect email address (got '%s')"), email);
}
}
@@ -403,7 +403,7 @@ const char *fmt_ident(const char *name, const char *email,
strbuf_addch(&ident, ' ');
if (date_str && date_str[0]) {
if (parse_date(date_str, &ident) < 0)
- die("invalid date format: %s", date_str);
+ die(_("invalid date format: %s"), date_str);
}
else
strbuf_addstr(&ident, ident_default_date());
--
2.12.0.rc2.597.g959f68882
next prev parent reply other threads:[~2017-02-23 8:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-03 4:13 possible bug: inconsistent CLI behaviour for empty user.name bs.x.ttp
2017-02-23 8:11 ` Jeff King
2017-02-23 8:12 ` Jeff King [this message]
2017-02-23 8:13 ` [PATCH 2/4] ident: handle NULL email when complaining of empty name Jeff King
2017-02-23 8:15 ` [PATCH 3/4] ident: reject all-crud ident name Jeff King
2017-02-23 8:17 ` [PATCH 4/4] ident: do not ignore empty config name/email Jeff King
2017-02-23 20:58 ` Junio C Hamano
2017-02-24 1:08 ` Jeff King
2017-02-24 4:11 ` Junio C Hamano
2017-02-24 4:18 ` Jeff King
2017-02-27 15:08 ` Dennis Kaarsemaker
2017-02-27 20:42 ` Junio C Hamano
2017-02-28 5:28 ` Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170223081230.4u4xpebfhmr2h4gk@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bs.x.ttp@recursor.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).