summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8b6cda7)
raw | patch | inline | side by side (parent: 8b6cda7)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Mon, 13 Sep 2010 19:02:23 +0000 (19:02 +0000) | ||
committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sat, 30 Oct 2010 07:58:21 +0000 (07:58 +0000) |
Gettextize the "You asked to pull" error message. This message
interpolated $1 which won't work with eval_gettext for obvious
reasons, so I needed to provide an alias for it.
This also made the message easier to translate, and I added a
TRANSLATORS comment to make it even easier.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
interpolated $1 which won't work with eval_gettext for obvious
reasons, so I needed to provide an alias for it.
This also made the message easier to translate, and I added a
TRANSLATORS comment to make it even easier.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
git-pull.sh | patch | blob | history |
diff --git a/git-pull.sh b/git-pull.sh
index 69281b04f4ce0baaa748c2452e91f4459fb6907b..4c08623b9ad04e02ebc17ca429c655bcb2d48eb0 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
matches on the remote end."; echo
fi
elif [ $# -gt 0 ] && [ "$1" != "$remote" ]; then
- echo "You asked to pull from the remote '$1', but did not specify"
- echo "a branch. Because this is not the default configured remote"
- echo "for your current branch, you must specify a branch on the command line."
+ requested_remote=$1
+ # TRANSLATORS: $requested_remote will be a remote name, like
+ # "origin" or "avar"
+ eval_gettext "You asked to pull from the remote '\$requested_remote', but did not specify
+a branch. Because this is not the default configured remote
+for your current branch, you must specify a branch on the command line."; echo
elif [ -z "$curr_branch" ]; then
echo "You are not currently on a branch, so I cannot use any"
echo "'branch.<branchname>.merge' in your configuration file."