opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

i18n: git-parse-remote.sh: mark strings for translation 

Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.

TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-04-19 13:19:20 +00:00 committed by Junio C Hamano
parent 60ea78b8a1
commit 045fac5845
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2069,7 +2069,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
--keyword=gettextln --keyword=eval_gettextln --keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H) LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH = $(SCRIPT_SH) LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
LOCALIZED_PERL = $(SCRIPT_PERL) LOCALIZED_PERL = $(SCRIPT_PERL)
ifdef XGETTEXT_INCLUDE_TESTS ifdef XGETTEXT_INCLUDE_TESTS

46
git-parse-remote.sh
View File

@ -56,11 +56,13 @@ get_remote_merge_branch () {
error_on_missing_default_upstream () { error_on_missing_default_upstream () {
cmd="$1" cmd="$1"
op_type="$2" op_type="$2"
op_prep="$3" op_prep="$3" # FIXME: op_prep is no longer used
example="$4" example="$4"
branch_name=$(git symbolic-ref -q HEAD) branch_name=$(git symbolic-ref -q HEAD)
display_branch_name="${branch_name#refs/heads/}"
# If there's only one remote, use that in the suggestion # If there's only one remote, use that in the suggestion
remote="<remote>" remote="$(gettext "<remote>")"
branch="$(gettext "<branch>")"
if test $(git remote | wc -l) = 1 if test $(git remote | wc -l) = 1
then then
remote=$(git remote) remote=$(git remote)
@ -68,22 +70,32 @@ error_on_missing_default_upstream () {
if test -z "$branch_name" if test -z "$branch_name"
then then
echo "You are not currently on a branch. Please specify which gettextln "You are not currently on a branch."
branch you want to $op_type $op_prep. See git-${cmd}(1) for details.
$example
"
else else
echo "There is no tracking information for the current branch. gettextln "There is no tracking information for the current branch."
Please specify which branch you want to $op_type $op_prep. fi
See git-${cmd}(1) for details case "$op_type" in
rebase)
$example gettextln "Please specify which branch you want to rebase against."
;;
If you wish to set tracking information for this branch you can do so with: merge)
gettextln "Please specify which branch you want to merge with."
git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/} ;;
" *)
echo >&2 "BUG: unknown operation type: $op_type"
exit 1
;;
esac
eval_gettextln "See git-\${cmd}(1) for details."
echo
echo " $example"
echo
if test -n "$branch_name"
then
gettextln "If you wish to set tracking information for this branch you can do so with:"
echo
echo " git branch --set-upstream-to=$remote/$branch $display_branch_name"
echo
fi fi
exit 1 exit 1
} }