From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vasco Almeida Subject: [PATCH v4 09/38] i18n: rebase: fix marked string to use eval_gettext variant Date: Tue, 7 Jun 2016 11:52:08 +0000 Message-ID: <1465300357-7557-10-git-send-email-vascomalmeida@sapo.pt> References: <1465300357-7557-1-git-send-email-vascomalmeida@sapo.pt> Cc: Vasco Almeida , Jiang Xin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , Sunshine , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jun 07 13:54:33 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bAFaY-0007Nz-1z for gcvg-git-2@plane.gmane.org; Tue, 07 Jun 2016 13:54:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754812AbcFGLyJ (ORCPT ); Tue, 7 Jun 2016 07:54:09 -0400 Received: from relay5.ptmail.sapo.pt ([212.55.154.25]:57849 "EHLO sapo.pt" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754763AbcFGLyF (ORCPT ); Tue, 7 Jun 2016 07:54:05 -0400 Received: (qmail 622 invoked from network); 7 Jun 2016 11:54:03 -0000 Received: (qmail 12793 invoked from network); 7 Jun 2016 11:54:03 -0000 Received: from unknown (HELO localhost.localdomain) (vascomalmeida@sapo.pt@[85.246.157.91]) (envelope-sender ) by ptmail-mta-auth02 (qmail-ptmail-1.0.0) with ESMTPA for ; 7 Jun 2016 11:54:00 -0000 X-PTMail-RemoteIP: 85.246.157.91 X-PTMail-AllowedSender-Action: X-PTMail-Service: default X-Mailer: git-send-email 2.7.3 In-Reply-To: <1465300357-7557-1-git-send-email-vascomalmeida@sapo.pt> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The string message marked for translation should use eval_gettext variant instead of the gettext one, since we want to dollar-substitute $head_name in the result. Signed-off-by: Vasco Almeida --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 44ede36..1fadc04 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -154,7 +154,7 @@ move_to_original_branch () { git symbolic-ref \ -m "rebase finished: returning to $head_name" \ HEAD $head_name || - die "$(gettext "Could not move back to $head_name")" + die "$(eval_gettext "Could not move back to \$head_name")" ;; esac } -- 2.7.3