Re: [PATCH 1/2] Change error messages in ident.c Make error messages caused by failed reads of the /etc/passwd file easier to understand. Signed-off-by: Angus Hammond <angusgh@gmail.com>
- From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
- Date
- May 11, 2012, 11:35 UTC
- Message-ID
- <CACsJy8AfrF8YyOA41F80igwG8DGfWyi+wRwpo6TvADe=FnZgag@mail.gmail.com>
- In-Reply-To
- <1336676770-17965-1-git-send-email-angusgh@gmail.com>
On Fri, May 11, 2012 at 2:06 AM, Angus Hammond <angusgh@gmail.com> wrote:
> --- > ident.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-)
While you are touching this, perhaps you can also turn all die(xxx) in this file to die(_(xxx)), same for warning()? You touch 5 out of 11 already. And it helps make sure all the new strings are in the same humor level (aka none). _() allows the messages to be translated in another language, by the way.
Also this on top so we get nice advice
diff --git a/ident.c b/ident.c index 87c697c..b5a631f 100644 --- a/ident.c +++ b/ident.c @@ -289,7 +289,7 @@ person_only: } static const char *env_hint = -"\n" +N_("\n" "*** Please tell me who you are.\n" "\n" "Run\n" @@ -299,7 +299,7 @@ static const char *env_hint = "\n" "to set your account\'s default identity.\n" "Omit --global to set the identity only in this repository.\n" -"\n"; +"\n"); const char *fmt_ident(const char *name, const char *email, const char *date_str, int flag) @@ -318,7 +318,7 @@ const char *fmt_ident(const char *name, const char *email, if ((warn_on_no_name || error_on_no_name) && name == git_default_name && env_hint) { - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); env_hint = NULL; /* warn only once */ } if (error_on_no_name)
-- Duy