From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 21/48] i18n: git-submodule $update_module say + die messages Date: Sun, 8 May 2011 12:20:53 +0000 Message-ID: <1304857280-14773-22-git-send-email-avarab@gmail.com> References: <1304857280-14773-1-git-send-email-avarab@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun May 08 14:22:21 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QJ307-0003rg-Sk for gcvg-git-2@lo.gmane.org; Sun, 08 May 2011 14:22:20 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918Ab1EHMWG convert rfc822-to-quoted-printable (ORCPT ); Sun, 8 May 2011 08:22:06 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:37472 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753048Ab1EHMVv (ORCPT ); Sun, 8 May 2011 08:21:51 -0400 Received: by mail-ey0-f174.google.com with SMTP id 24so1325598eyx.19 for ; Sun, 08 May 2011 05:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=jeonQ8UAmy14hMN0YDV3lhzPKVubBeNajH52txl055E=; b=PGtdOPby/8puwfTuEKHx/k4vp3CpnczMG4WyTHkgelhf2BefOFlahjDxH0NaqBsO7V QkH4X00JVUErgPKBs1ALQwubrytlqqUuAnP2d59r1WYY51mr305vHA9ajVt6TefsM57R CDCPFpJOPzVfzW2TnGf17p2qc/MUu1gjY74qc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=aRJ+I//o7gh6dgmwpyAmzbacMK1UYS+WV2NWVKmJk+AjRkrgDBms4NjJws+U+5vmzc 4jw8DJ/BQLrOzQc2AEE9rpVFw3ZkOEEaKzzpgKELu7ZwzqUIRbM63R/DVsvMg1eIwnr0 JrXms14Hw/MlgnQ/dCvQbhwn1ZDiqf23sghiA= Received: by 10.14.15.20 with SMTP id e20mr2943095eee.16.1304857311301; Sun, 08 May 2011 05:21:51 -0700 (PDT) Received: from w.nix.is (w.nix.is [188.40.98.140]) by mx.google.com with ESMTPS id n55sm2690046een.2.2011.05.08.05.21.50 (version=SSLv3 cipher=OTHER); Sun, 08 May 2011 05:21:50 -0700 (PDT) X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304857280-14773-1-git-send-email-avarab@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Gettextize $update_module say and die messages. These messages needed to be split up to make them translatable. Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason --- git-submodule.sh | 17 ++++++++--------- t/t7406-submodule-update.sh | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 1c3d4ce..ecd0b68 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -511,24 +511,23 @@ cmd_update() case "$update_module" in rebase) command=3D"git rebase" - action=3D"rebase" - msg=3D"rebased onto" + die_msg=3D"$(eval_gettext "Unable to rebase '\$sha1' in submodule = path '\$path'")" + say_msg=3D"$(eval_gettext "Submodule path '\$path': rebased into '= \$sha1'")" ;; merge) command=3D"git merge" - action=3D"merge" - msg=3D"merged in" + die_msg=3D"$(eval_gettext "Unable to merge '\$sha1' in submodule p= ath '\$path'")" + say_msg=3D"$(eval_gettext "Submodule path '\$path': merged in '\$s= ha1'")" ;; *) command=3D"git checkout $subforce -q" - action=3D"checkout" - msg=3D"checked out" + die_msg=3D"$(eval_gettext "Unable to checkout '\$sha1' in submodul= e path '\$path'")" + say_msg=3D"$(eval_gettext "Submodule path '\$path': checked out '\= $sha1'")" ;; esac =20 - (clear_local_git_env; cd "$path" && $command "$sha1") || - die "Unable to $action '$sha1' in submodule path '$path'" - say "Submodule path '$path': $msg '$sha1'" + (clear_local_git_env; cd "$path" && $command "$sha1") || die $die_m= sg + say $say_msg fi =20 if test -n "$recursive" diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4f16fcc..60e33be 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -90,7 +90,7 @@ test_expect_success 'submodule update does not fetch = already present commits' ' (cd super && git submodule update > ../actual 2> ../actual.err ) && - test_cmp expected actual && + test_i18ncmp expected actual && ! test -s actual.err ' =20 --=20 1.7.4.4