| Message ID | 20211101021417.9549-1-worldhello.net@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f27cf928559b4b218b8f27b32b2f3b591dcaf98b |
| Headers | show |
| Series | [v2] i18n: fix typos found during l10n for git 2.34.0 | expand |
Jiang Xin <worldhello.net@gmail.com> writes: > Emir and Jean-Noël reported typos in some i18n messages when preparing > l10n for git 2.34.0. > > * Fix unstable spelling of config variable "gpg.ssh.defaultKeyCommand" > which was introduced in commit fd9e226776 (ssh signing: retrieve a > default key from ssh-agent, 2021-09-10). > > * Add missing space between "with" and "--python" which was introduced > in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26). > > * Fix unmatched single quote in 'builtin/index-pack.c' which was > introduced in commit 8737dab346 (index-pack: refactor renaming in > final(), 2021-09-09) > > [1] https://github.com/git-l10n/git-po/pull/567 > > Reported-by: Emir Sarı <bitigchi@me.com> > Reported-by: Jean-Noël Avila <jn.avila@free.fr> > Signed-off-by: Jiang Xin <worldhello.net@gmail.com> > --- > builtin/index-pack.c | 2 +- > gpg-interface.c | 2 +- > ref-filter.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) All three hunks look sensible. Will directly apply on 'master'. Thanks.
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c > index 15ae406e6b..c23d01de7d 100644 > --- a/builtin/index-pack.c > +++ b/builtin/index-pack.c > @@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name, > if (!*final_name) > *final_name = odb_pack_name(name, hash, ext); > if (finalize_object_file(curr_name, *final_name)) > - die(_("unable to rename temporary '*.%s' file to '%s"), > + die(_("unable to rename temporary '*.%s' file to '%s'"), > ext, *final_name); > } else if (make_read_only_if_same) { > chmod(*final_name, 0444); > diff --git a/gpg-interface.c b/gpg-interface.c > index 800d8caa67..68d2f29be7 100644 > --- a/gpg-interface.c > +++ b/gpg-interface.c > @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void) > if (keys[0] && starts_with(keys[0]->buf, "ssh-")) { > default_key = strbuf_detach(keys[0], NULL); > } else { > - warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"), > + warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"), > key_stderr.buf, key_stdout.buf); > } > Looks OK. > diff --git a/ref-filter.c b/ref-filter.c > index 282cdad103..08a3f839c9 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format) > format->quote_style == QUOTE_TCL) && > used_atom[at].atom_type == ATOM_RAW && > used_atom[at].u.raw_data.option == RAW_BARE) > - die(_("--format=%.*s cannot be used with" > + die(_("--format=%.*s cannot be used with " > "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2); > cp = ep + 1; > > Why not using \n?
Bagas Sanjaya <bagasdotme@gmail.com> writes: >> diff --git a/ref-filter.c b/ref-filter.c >> index 282cdad103..08a3f839c9 100644 >> --- a/ref-filter.c >> +++ b/ref-filter.c >> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format) >> format->quote_style == QUOTE_TCL) && >> used_atom[at].atom_type == ATOM_RAW && >> used_atom[at].u.raw_data.option == RAW_BARE) >> - die(_("--format=%.*s cannot be used with" >> + die(_("--format=%.*s cannot be used with " >> "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2); >> cp = ep + 1; >> > > Why not using \n? It is not quite clear to me why it should. Among the possible string that is (ep - sp - 2) bytes long (i.e. --python, --shell, --tcl, --raw), even with the longest, the resulting message would become fatal: --format=--python cannot be used with --python, --shell, --tcl. that is unusually short with such a newline in the middle.
On Thu, Nov 4, 2021 at 12:26 AM Junio C Hamano <gitster@pobox.com> wrote: > > Bagas Sanjaya <bagasdotme@gmail.com> writes: > > >> diff --git a/ref-filter.c b/ref-filter.c > >> index 282cdad103..08a3f839c9 100644 > >> --- a/ref-filter.c > >> +++ b/ref-filter.c > >> @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format) > >> format->quote_style == QUOTE_TCL) && > >> used_atom[at].atom_type == ATOM_RAW && > >> used_atom[at].u.raw_data.option == RAW_BARE) > >> - die(_("--format=%.*s cannot be used with" > >> + die(_("--format=%.*s cannot be used with " > >> "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2); > >> cp = ep + 1; > >> > > > > Why not using \n? > > It is not quite clear to me why it should. > > Among the possible string that is (ep - sp - 2) bytes long (i.e. > --python, --shell, --tcl, --raw), even with the longest, the > resulting message would become > > fatal: --format=--python cannot be used with > --python, --shell, --tcl. > > that is unusually short with such a newline in the middle. In order to detect typos in new i18n messages added upstream in time, a new CI workflow has been added in the "pot/CI" branch. See: https://github.com/git-l10n/git-po/blob/pot/CI/.github/workflows/git-pot.yml This workflow will be triggered several times a day, and changes of i18n messages will be saved as "YYYY-mm-dd.diff" in the following branches: * https://github.com/git-l10n/git-po/tree/pot/master * https://github.com/git-l10n/git-po/tree/pot/next * https://github.com/git-l10n/git-po/tree/pot/seen L10n contributors can also refer to the "po/git.pot" file in the "pot/master" branch to prepare translations in advance. -- Jiang Xin
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 15ae406e6b..c23d01de7d 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1486,7 +1486,7 @@ static void rename_tmp_packfile(const char **final_name, if (!*final_name) *final_name = odb_pack_name(name, hash, ext); if (finalize_object_file(curr_name, *final_name)) - die(_("unable to rename temporary '*.%s' file to '%s"), + die(_("unable to rename temporary '*.%s' file to '%s'"), ext, *final_name); } else if (make_read_only_if_same) { chmod(*final_name, 0444); diff --git a/gpg-interface.c b/gpg-interface.c index 800d8caa67..68d2f29be7 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -775,7 +775,7 @@ static const char *get_default_ssh_signing_key(void) if (keys[0] && starts_with(keys[0]->buf, "ssh-")) { default_key = strbuf_detach(keys[0], NULL); } else { - warning(_("gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"), + warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"), key_stderr.buf, key_stdout.buf); } diff --git a/ref-filter.c b/ref-filter.c index 282cdad103..08a3f839c9 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1037,7 +1037,7 @@ int verify_ref_format(struct ref_format *format) format->quote_style == QUOTE_TCL) && used_atom[at].atom_type == ATOM_RAW && used_atom[at].u.raw_data.option == RAW_BARE) - die(_("--format=%.*s cannot be used with" + die(_("--format=%.*s cannot be used with " "--python, --shell, --tcl"), (int)(ep - sp - 2), sp + 2); cp = ep + 1;
Emir and Jean-Noël reported typos in some i18n messages when preparing l10n for git 2.34.0. * Fix unstable spelling of config variable "gpg.ssh.defaultKeyCommand" which was introduced in commit fd9e226776 (ssh signing: retrieve a default key from ssh-agent, 2021-09-10). * Add missing space between "with" and "--python" which was introduced in commit bd0708c7eb (ref-filter: add %(raw) atom, 2021-07-26). * Fix unmatched single quote in 'builtin/index-pack.c' which was introduced in commit 8737dab346 (index-pack: refactor renaming in final(), 2021-09-09) [1] https://github.com/git-l10n/git-po/pull/567 Reported-by: Emir Sarı <bitigchi@me.com> Reported-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- builtin/index-pack.c | 2 +- gpg-interface.c | 2 +- ref-filter.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)