[PATCH v2 2/2] i18n: assure command not corrupted by _() process
flat view
STALE3780d
From: Sandy Carter <hidden>
Date: 2016-06-15 23:00:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Separate message from command examples to avoid translation issues such as a dash being omitted in a translation. Signed-off-by: Sandy Carter <redacted> --- builtin/branch.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index b4d7716..b304da8 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c@@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix) */ if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && !branch_existed && remote_tracking) { - fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); - fprintf(stderr, _(" git branch -d %s\n"), branch->name); - fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); + fprintf(stderr, "\n"); + fprintf(stderr, _("If you wanted to make '%s' track '%s', do this:"), head, branch->name); + fprintf(stderr, "\n\n"); + fprintf(stderr, " git branch -d %s\n", branch->name); + fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name); + fprintf(stderr, "\n"); } - } else usage_with_options(builtin_branch_usage, options);
--
1.9.0