i18n: bisect: simplify error message for i18n
The message was not being extracted by xgettext, although it was marked for translation, seemingly because it contained a command substitution. Moreover, eval_gettext should be used instead of gettext for strings with substitution. See step 4. of section 15.5.2.1 Preparing Shell Scripts for Internationalization from gettext manual [1]: "Simplify translatable strings so that they don't contain command substitution ("`...`" or "$(...)") [...]" [1] http://www.gnu.org/software/gettext/manual/html_node/Preparing-Shell-Scripts.html Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 20:21 UTC
57984dd9fc1d3c78826e41c7e7100af331758161
1 file changed
+3
-2
git-bisect.sh
+3
-2
@@ -277,8 +277,9 @@ bisect_state() {
277
0,*)
278
die "$(gettext "Please call 'bisect_state' with at least one argument.")" ;;
279
1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip)
280
- rev=$(git rev-parse --verify $(bisect_head)) ||
281
- die "$(gettext "Bad rev input: $(bisect_head)")"
280
+ bisected_head=$(bisect_head)
281
+ rev=$(git rev-parse --verify "$bisected_head") ||
282
+ die "$(eval_gettext "Bad rev input: \$bisected_head")"
283
bisect_write "$state" "$rev"
284
check_expected_revs "$rev" ;;
285
2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)