From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Niedier" <jrnieder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] am: quote string for translation before passing to eval_gettextln
Date: Wed, 22 Aug 2012 21:48:03 +0700 [thread overview]
Message-ID: <1345646883-18746-1-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <20120822141726.GA674@mannheim-rule.local>
If it's not quoted, the string is expanded before it gets looked up in
gettext database and obviously nothing is returned.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
On Wed, Aug 22, 2012 at 9:17 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Nguyen Thai Ngoc Duy wrote:
>
>> which means git performed a lookup on that string. It is from git-am.sh:
>>
>> eval_gettextln "The copy of the patch that failed is found in:
>> $dotest/patch"
>
> Good catch. It should use single-quotes.
Yep. Verified. Also checked that no other places have this problem.
xgettext probably detects this too. Without this patch it does not
collect this string. With this patch, it does.
git-am.sh | 4 ++--
1 tập tin đã bị thay đổi, 2 được thêm vào(+), 2 bị xóa(-)
diff --git a/git-am.sh b/git-am.sh
index bd9620c..c682d34 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -855,8 +855,8 @@ did you forget to use 'git add'?"
eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
if test "$(git config --bool advice.amworkdir)" != false
then
- eval_gettextln "The copy of the patch that failed is found in:
- $dotest/patch"
+ eval_gettextln 'The copy of the patch that failed is found in:
+ $dotest/patch'
fi
stop_here_user_resolve $this
fi
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2012-08-22 14:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 14:10 eval_gettextln does not work correctly? Nguyen Thai Ngoc Duy
2012-08-22 14:17 ` Jonathan Nieder
2012-08-22 14:48 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-22 19:38 ` [PATCH] am: quote string for translation before passing to eval_gettextln 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345646883-18746-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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.
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 NNTP newsgroup(s).