Merge branch 'va/i18n-even-more'

gitster · gitster · commit eef32a0653f9 · 2016-12-27T00:11:45.000-08:00
* va/i18n-even-more:
  i18n: fix misconversion in shell scripts
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -437,7 +437,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
@@ -196,14 +196,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
`@@ -196,14 +196,14 @@ require_work_tree_exists () {`
`196`	`196`	`if test "z$(git rev-parse --is-bare-repository)" != zfalse`
`197`	`197`	`then`
`198`	`198`	`program_name=$0`
`199`		`- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"`
	`199`	`+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"`
`200`	`200`	`fi`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`require_work_tree () {`
`204`	`204`	`test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true \|\| {`
`205`	`205`	`program_name=$0`
`206`		`- die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"`
	`206`	`+ die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`