git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process

From
Sandy Carter <sandy.carter@savoirfairelinux.com>
Date
Mar 10, 2014, 12:51 UTC
Message-ID
<531DB549.5060304@savoirfairelinux.com>
In-Reply-To
<1393858554-4392-2-git-send-email-sandy.carter@savoirfairelinux.com>
Is there any update on this patch?
Le 2014-03-03 09:55, Sandy Carter a écrit :
Show 31 quoted lines
> Separate message from command examples to avoid translation issues
> such as a dash being omitted in a translation.
>
> Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
> ---
>   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);
>
>
Previous: Sandy CarterNext: Duy Nguyen
Message 7 of 11 in “i18n: proposed command missing leading dash”
  1. i18n: proposed command missing leading dashSandy Carter, Feb 28, 2014
  2. Jonathan NiederFeb 28, 2014
  3. Junio C HamanoFeb 28, 2014
  4. Sandy CarterMar 1, 2014
  5. 1/2 i18n: proposed command missing leading dashSandy Carter, Mar 3, 2014
  6. 2/2 i18n: assure command not corrupted by _() processSandy Carter, Mar 3, 2014
  7. Sandy CarterMar 10, 2014
  8. Duy NguyenMar 11, 2014
  9. Junio C HamanoMar 4, 2014
  10. Jiang XinMar 5, 2014
  11. Junio C HamanoMar 5, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.