diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2012-04-30 15:33:12 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 10:49:49 -0700 |
| commit | c179837cfb43f5e354417c44c31410de5a74623b (patch) | |
| tree | 9dd2a55d2b317927eb6c208cf833b3d48f78ae0e | |
| parent | 10d4332e007132a38dc61f03c760d355da5cd550 (diff) | |
| download | git-c179837cfb43f5e354417c44c31410de5a74623b.tar.gz git-c179837cfb43f5e354417c44c31410de5a74623b.tar.xz | |
git-branch: remove lego in i18n messages
Instead of making translators translate "remote " and then using
"%sbranch" where "%s" is either "remote " or "" just split the two up
into separate messages. This makes the translation of this section of
git-branch much less confusing.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/branch.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 5f150b4e8..8813d2e31 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -152,21 +152,22 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, struct commit *rev, *head_rev = NULL; unsigned char sha1[20]; char *name = NULL; - const char *fmt, *remote; + const char *fmt; int i; int ret = 0; + int remote_branch = 0; struct strbuf bname = STRBUF_INIT; switch (kinds) { case REF_REMOTE_BRANCH: fmt = "refs/remotes/%s"; - /* TRANSLATORS: This is "remote " in "remote branch '%s' not found" */ - remote = _("remote "); + /* For subsequent UI messages */ + remote_branch = 1; + force = 1; break; case REF_LOCAL_BRANCH: fmt = "refs/heads/%s"; - remote = ""; break; default: die(_("cannot use -a with -d")); @@ -190,8 +191,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, name = xstrdup(mkpath(fmt, bname.buf)); if (read_ref(name, sha1)) { - error(_("%sbranch '%s' not found."), - remote, bname.buf); + error(remote_branch + ? _("remote branch '%s' not found.") + : _("branch '%s' not found."), bname.buf); ret = 1; continue; } @@ -212,14 +214,18 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, } if (delete_ref(name, sha1, 0)) { - error(_("Error deleting %sbranch '%s'"), remote, + error(remote_branch + ? _("Error deleting remote branch '%s'") + : _("Error deleting branch '%s'"), bname.buf); ret = 1; } else { struct strbuf buf = STRBUF_INIT; if (!quiet) - printf(_("Deleted %sbranch %s (was %s).\n"), - remote, bname.buf, + printf(remote_branch + ? _("Deleted remote branch %s (was %s).\n") + : _("Deleted branch %s (was %s).\n"), + bname.buf, find_unique_abbrev(sha1, DEFAULT_ABBREV)); strbuf_addf(&buf, "branch.%s", bname.buf); if (git_config_rename_section(buf.buf, NULL) < 0) |