[Improvements,on,messages,0/5] Disambuiguate between options and commands

Message

Alexander Shopov Feb. 16, 2024, 10:15 a.m. UTC

These are trivial fixes to messages.
They make sure commands and options are markes as such.
This will help translators and end users.
This will also reduce the special cases Jiang Xin keeps
for git-po-helper which will ease maintenance.

I am basing these on maint but I have also checked that
they ar still relevant by cherry picking on top of latest and next.

Each patch contains a single message fix. Each patch is sent to
 - This list
 - Jiang Xin
 - Junio C Hamano
 - The developer who last edited the line I am changing

These are nice to be merged but this is not urgent.

Alexander Shopov (5):
  rebase: trivial fix of error message
  transport-helper.c: trivial fix of error message
  builtin/remote.c: trivial fix of error message
  builtin/clone.c: trivial fix of message
  revision.c: trivial fix to message

 builtin/clone.c    | 2 +-
 builtin/rebase.c   | 2 +-
 builtin/remote.c   | 2 +-
 revision.c         | 2 +-
 transport-helper.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--
2.43.2

Comments

Junio C Hamano Feb. 16, 2024, 6:43 p.m. UTC | #1

Alexander Shopov <[e-mail]> writes:

> These are trivial fixes to messages.
> They make sure commands and options are markes as such.
> This will help translators and end users.
> This will also reduce the special cases Jiang Xin keeps
> for git-po-helper which will ease maintenance.
>
> I am basing these on maint but I have also checked that
> they ar still relevant by cherry picking on top of latest and next.

I've looked at all of them and they looked sensible.

The changes look like this:

	-	die(_("something option something: %s"), arg);
	+	die(_("something --option something: %s"), arg);

It is not a fault of this patch, but wasn't the concensus that the
ideal form would be more like this:

		die(_("something %s something: %s"), "--option", arg);

in order to completely avoid tempting translators into touching
"--option", IIRC?

These patches do not make things worse, so I am willing to say they
are strict improvements and the series is a good first step if we
wanted to follow through to eject option names out of translatable
strings later.

Thanks.

Junio C Hamano March 5, 2024, 10:05 p.m. UTC | #2

Alexander Shopov <[e-mail]> writes:

> These are nice to be merged but this is not urgent.
>
> Alexander Shopov (5):
>   rebase: trivial fix of error message
>   transport-helper.c: trivial fix of error message
>   builtin/remote.c: trivial fix of error message
>   builtin/clone.c: trivial fix of message
>   revision.c: trivial fix to message

The first one got commented on with a suggestion to drop it; any
comments on other patches, anybody?

If not, I'll drop the first patch and merge the remainder down to
'next'.

Thanks.