i18n: fix misconversion in shell scripts

gitster · gitster · commit acefe2be287b · 2016-12-20T09:36:23.000-08:00
An earlier series that was merged at 2703572 ("Merge branch 'va/i18n-even-more'", 2016-07-13) failed to use $(eval_gettext "string with \$variable interpolation") and instead used gettext in a few places, and ended up showing the variable names in the message, e.g. $ git submodule fatal: $program_name cannot be used without a working tree. Catch these mistakes with $ git grep -n '[^_]gettext .*\\\$' and fix them all to use eval_gettext instead. Reported-by: Josh Bleecher Snyder Acked-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -467,7 +467,8 @@ update_squash_messages () {
 			}' <"$squash_msg".bak
 		} >"$squash_msg"
 	else
-		commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
+		commit_message HEAD >"$fixup_msg" ||
+		die "$(eval_gettext "Cannot write \$fixup_msg")"
 		count=2
 		{
 			printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
@@ -194,14 +194,14 @@ require_work_tree_exists () {
 	if test "z$(git rev-parse --is-bare-repository)" != zfalse
 	then
 		program_name=$0
-		die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
+		die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
 	fi
 }
 
 require_work_tree () {
 	test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || {
 		program_name=$0
-		die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
+		die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -194,14 +194,14 @@ require_work_tree_exists () {`
`194`	`194`	`if test "z$(git rev-parse --is-bare-repository)" != zfalse`
`195`	`195`	`then`
`196`	`196`	`program_name=$0`
`197`		`- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"`
	`197`	`+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"`
`198`	`198`	`fi`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`require_work_tree () {`
`202`	`202`	`test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true \|\| {`
`203`	`203`	`program_name=$0`
`204`		`- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"`
	`204`	`+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`