threads / patch / 55705

patchstash: don't translate literal commands

Subject: [PATCH] stash: don't translate literal commands

## tl;dr

3 messages between May 16, 2021 and May 18, 2021. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Alex Henrie· May 16, 2021, 21:57 UTC · lore

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/stash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to builtin/stash.c +2 −2

diff --git a/builtin/stash.c b/builtin/stash.c
index d68ed784d2..075bcf6ee5 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -26,7 +26,7 @@ static const char * const git_stash_usage[] = {
 	N_("git stash drop [-q|--quiet] [<stash>]"),
 	N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
 	N_("git stash branch <branchname> [<stash>]"),
-	N_("git stash clear"),
+	"git stash clear",
 	N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 	   "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 	   "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
@@ -67,7 +67,7 @@ static const char * const git_stash_branch_usage[] = {
 };
 
 static const char * const git_stash_clear_usage[] = {
-	N_("git stash clear"),
+	"git stash clear",
 	NULL
 };

-- 
2.31.1

Derrick Stolee· May 17, 2021, 16:48 UTC · re: Alex Henrie · lore

Re: [PATCH] stash: don't translate literal commands

On 5/16/2021 5:57 PM, Alex Henrie wrote:

Show 15 quoted lines

> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/stash.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin/stash.c b/builtin/stash.c
> index d68ed784d2..075bcf6ee5 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -26,7 +26,7 @@ static const char * const git_stash_usage[] = {
>  	N_("git stash drop [-q|--quiet] [<stash>]"),
>  	N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
>  	N_("git stash branch <branchname> [<stash>]"),
> -	N_("git stash clear"),
> +	"git stash clear",

I immediately saw the commands above and wondered why you are not removing them from being translated. My guess is that the "<stash>" strings are the bits that are interesting to translate. Perhaps add some description in your commit message as to why you are drawing the line here?

Show 5 quoted lines

>  static const char * const git_stash_clear_usage[] = {
> -	N_("git stash clear"),
> +	"git stash clear",
>  	NULL
>  };

Are there other instances in builtin/*.c? If not, then it would be nice to say so. Otherwise, it would be good to fix them, while you are here.

Thanks, -Stolee

Alex Henrie· May 18, 2021, 06:08 UTC · re: Derrick Stolee · lore

Re: [PATCH] stash: don't translate literal commands

On Mon, May 17, 2021 at 10:48 AM Derrick Stolee <stolee@gmail.com> wrote:

Show 12 quoted lines

>
> On 5/16/2021 5:57 PM, Alex Henrie wrote:
>
> >  static const char * const git_stash_clear_usage[] = {
> > -     N_("git stash clear"),
> > +     "git stash clear",
> >       NULL
> >  };
>
> Are there other instances in builtin/*.c? If not, then it
> would be nice to say so. Otherwise, it would be good to fix
> them, while you are here.

I reviewed all of the translatable strings and only found this problem in graph.c and builtin/stash.c.

-Alex