From: Bagas Sanjaya <bagasdotme@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Ryan Anderson <ryan@michonline.com>,
vmiklos@frugalware.org, bedhanger@gmx.de
Subject: [PATCH 2/2] request-pull: mark translatable strings
Date: Thu, 16 Sep 2021 18:35:17 +0700 [thread overview]
Message-ID: <20210916113516.76445-3-bagasdotme@gmail.com> (raw)
In-Reply-To: <20210916113516.76445-1-bagasdotme@gmail.com>
Mark user-faced strings as translatable (including PR message output).
Cc: Ryan Anderson <ryan@michonline.com>
Cc: vmiklos@frugalware.org
Cc: bedhanger@gmx.de
Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
git-request-pull.sh | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 9e1d2be9eb..8aa3a3f342 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -40,7 +40,7 @@ test -n "$base" && test -n "$url" || usage
baserev=$(git rev-parse --verify --quiet "$base"^0)
if test -z "$baserev"
then
- die "fatal: Not a valid revision: $base"
+ die "$(eval_gettext "fatal: Not a valid revision: \$base")"
fi
#
@@ -58,12 +58,12 @@ head=${head:-$(git show-ref --heads --tags "$local" | cut -d' ' -f2)}
head=${head:-$(git rev-parse --quiet --verify "$local")}
# None of the above? Bad.
-test -z "$head" && die "fatal: Not a valid revision: $local"
+test -z "$head" && die "$(eval_gettext "fatal: Not a valid revision: \$local")"
# This also verifies that the resulting head is unique:
# "git show-ref" could have shown multiple matching refs..
headrev=$(git rev-parse --verify --quiet "$head"^0)
-test -z "$headrev" && die "fatal: Ambiguous revision: $local"
+test -z "$headrev" && die "$(eval_gettext "fatal: Ambiguous revision: \$local")"
local_sha1=$(git rev-parse --verify --quiet "$head")
@@ -76,7 +76,7 @@ then
fi
merge_base=$(git merge-base $baserev $headrev) ||
-die "fatal: No commits in common between $base and $head"
+die "$(eval_gettext "fatal: No commits in common between \$base and \$head")"
# $head is the refname from the command line.
# Find a ref with the same name as $head that exists at the remote
@@ -120,13 +120,13 @@ remote_or_head=${remote:-HEAD}
if test -z "$ref"
then
- echo "warn: No match for commit $headrev found at $url" >&2
- echo "warn: Are you sure you pushed '$remote_or_head' there?" >&2
+ echo "$(eval_gettext "warn: No match for commit \$headrev found at \$url")" >&2
+ echo "$(eval_gettext "warn: Are you sure you pushed '\$remote_or_head' there?")" >&2
status=1
elif test "$local_sha1" != "$remote_sha1"
then
- echo "warn: $head found at $url but points to a different object" >&2
- echo "warn: Are you sure you pushed '$remote_or_head' there?" >&2
+ echo "$(eval_gettext "warn: \$head found at \$url but points to a different object")" >&2
+ echo "$(eval_gettext "warn: Are you sure you pushed '\$remote_or_head' there?")" >&2
status=1
fi
@@ -138,19 +138,22 @@ fi
url=$(git ls-remote --get-url "$url")
-git show -s --format='The following changes since commit %H:
+git show -s --format="
+$(gettext 'The following changes since commit %H:
%s (%ci)
are available in the Git repository at:
-' $merge_base &&
+')
+" $merge_base &&
echo " $url $pretty_remote" &&
-git show -s --format='
+git show -s --format="
+$(gettext '
for you to fetch changes up to %H:
%s (%ci)
-----------------------------------------------------------------' $headrev &&
+----------------------------------------------------------------')" $headrev &&
if test $(git cat-file -t "$head") = tag
then
@@ -162,7 +165,7 @@ fi &&
if test -n "$branch_name"
then
- echo "(from the branch description for $branch_name local branch)"
+ echo "$(eval_gettext "(from the branch description for \$branch_name local branch)")"
echo
git config "branch.$branch_name.description"
echo "----------------------------------------------------------------"
--
2.25.1
next prev parent reply other threads:[~2021-09-16 11:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 11:35 [PATCH 0/2] git-request-pull i18n Bagas Sanjaya
2021-09-16 11:35 ` [PATCH 1/2] request-pull: simplify "remote or HEAD" variable in warning messages Bagas Sanjaya
2021-09-16 13:09 ` Paolo Bonzini
2021-09-16 11:35 ` Bagas Sanjaya [this message]
2021-09-16 12:15 ` [PATCH 2/2] request-pull: mark translatable strings Ævar Arnfjörð Bjarmason
2021-09-16 13:44 ` Đoàn Trần Công Danh
2021-09-16 20:30 ` Junio C Hamano
2021-09-17 7:41 ` Bagas Sanjaya
2021-09-17 16:37 ` Junio C Hamano
2021-09-17 20:50 ` Miklos Vajna
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=20210916113516.76445-3-bagasdotme@gmail.com \
--to=bagasdotme@gmail.com \
--cc=bedhanger@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ryan@michonline.com \
--cc=vmiklos@frugalware.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.