diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-04-14 07:54:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 21:26:08 (GMT) |
| commit | 647202889397e775c294234ebd3df8b2c4473f0f (patch) | |
| tree | 880bd4dc5cea477730ff42d194df4c03f90b2559 | |
| parent | 17c82211ec2d29a6e7221948cba8dae9074dc5a6 (diff) | |
| download | git-647202889397e775c294234ebd3df8b2c4473f0f.zip git-647202889397e775c294234ebd3df8b2c4473f0f.tar.gz git-647202889397e775c294234ebd3df8b2c4473f0f.tar.bz2 | |
i18n: mark @{upstream} error messages for translation
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 8 | ||||
| -rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sha1_name.c b/sha1_name.c index 361708b..c633113 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -861,15 +861,15 @@ int interpret_branch_name(const char *name, struct strbuf *buf) * points to something different than a branch. */ if (!upstream) - return error("HEAD does not point to a branch"); + return error(_("HEAD does not point to a branch")); if (!upstream->merge || !upstream->merge[0]->dst) { if (!ref_exists(upstream->refname)) - return error("No such branch: '%s'", cp); + return error(_("No such branch: '%s'"), cp); if (!upstream->merge) - return error("No upstream configured for branch '%s'", + return error(_("No upstream configured for branch '%s'"), upstream->name); return error( - "Upstream branch '%s' not stored as a remote-tracking branch", + _("Upstream branch '%s' not stored as a remote-tracking branch"), upstream->merge[0]->src); } free(cp); diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index e742ce0..d6e5761 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -129,7 +129,7 @@ test_expect_success 'branch@{u} error message when no upstream' ' fatal: Needed a single revision EOF error_message non-tracking@{u} 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success '@{u} error message when no upstream' ' @@ -138,7 +138,7 @@ test_expect_success '@{u} error message when no upstream' ' fatal: Needed a single revision EOF test_must_fail git rev-parse --verify @{u} 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'branch@{u} error message with misspelt branch' ' @@ -147,7 +147,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' ' fatal: Needed a single revision EOF error_message no-such-branch@{u} 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success '@{u} error message when not on a branch' ' @@ -157,7 +157,7 @@ test_expect_success '@{u} error message when not on a branch' ' EOF git checkout HEAD^0 && test_must_fail git rev-parse --verify @{u} 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'branch@{u} error message if upstream branch not fetched' ' @@ -166,7 +166,7 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' ' fatal: Needed a single revision EOF error_message bad-upstream@{u} 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_expect_success 'pull works when tracking a local branch' ' |