From: Sandy Carter <sandy.carter@savoirfairelinux.com>
To: git@vger.kernel.org
Cc: sandy.carter@savoirfairelinux.com
Subject: [PATCH 1/2] i18n: ambiguous refname message is not translated
Date: Fri, 5 Sep 2014 14:57:24 -0400 [thread overview]
Message-ID: <1409943445-12283-2-git-send-email-sandy.carter@savoirfairelinux.com> (raw)
In-Reply-To: <1409943445-12283-1-git-send-email-sandy.carter@savoirfairelinux.com>
Allow warning message about ambuiguous refname to be exported to .pot files
when checking out a refname which is the name of a tag and of a branch for
example.
Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
---
sha1_name.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 63ee66f..6571287 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -434,7 +434,7 @@ static int interpret_nth_prior_checkout(const char *name, int namelen, struct st
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
{
- static const char *warn_msg = "refname '%.*s' is ambiguous.";
+ static const char *warn_msg = N_("refname '%.*s' is ambiguous.");
static const char *object_name_msg = N_(
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
@@ -454,7 +454,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
if (refs_found > 0) {
- warning(warn_msg, len, str);
+ warning(_(warn_msg), len, str);
if (advice_object_name_warning)
fprintf(stderr, "%s\n", _(object_name_msg));
}
@@ -514,7 +514,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
if (warn_ambiguous_refs &&
(refs_found > 1 ||
!get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
- warning(warn_msg, len, str);
+ warning(_(warn_msg), len, str);
if (reflog_len) {
int nth, i;
--
2.1.0
next prev parent reply other threads:[~2014-09-05 19:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 18:57 [PATCH 0/2] Translations for ambiguous refname warning Sandy Carter
2014-09-05 18:57 ` Sandy Carter [this message]
2014-09-05 18:57 ` [PATCH 2/2] i18n translate builtin warning, error, usage, fatal messages Sandy Carter
2014-09-05 19:47 ` Junio C Hamano
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=1409943445-12283-2-git-send-email-sandy.carter@savoirfairelinux.com \
--to=sandy.carter@savoirfairelinux.com \
--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).