From: Jonathan Nieder <jrnieder@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Brandon Williams <bmwill@google.com>,
Jiang Xin <worldhello.net@gmail.com>
Subject: Re: [PATCH] C style: use standard style for "TRANSLATORS" comments
Date: Thu, 11 May 2017 14:41:26 -0700 [thread overview]
Message-ID: <20170511214125.GB21723@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20170511212012.6782-1-avarab@gmail.com>
Hi,
Ævar Arnfjörð Bjarmason wrote:
> Change all the "TRANSLATORS: [...]" comments in the C code to use the
> regular Git coding style, and amend the style guide so that the
> example there uses that style.
Hooray!
[...]
> --- a/Documentation/CodingGuidelines
> +++ b/Documentation/CodingGuidelines
> @@ -256,12 +256,12 @@ For C programs:
>
> Note however that a comment that explains a translatable string to
The "Note however" isn't needed since it's not contradicting
the previous point any more. This can be an entirely separate item:
- A comment that explains a translatable string to translators
uses a convention of starting with a magic token "TRANSLATORS: "
[etc]
It might even make sense to remove the explanation of TRANSLATORS
comments from this file altogether, since they're intuitive to use.
A more common place to want to learn about them is po/README, which
already explains them.
[...]
> --- a/bisect.c
> +++ b/bisect.c
> @@ -995,8 +995,10 @@ int bisect_next_all(const char *prefix, int no_checkout)
>
> steps_msg = xstrfmt(Q_("(roughly %d step)", "(roughly %d steps)",
> steps), steps);
> - /* TRANSLATORS: the last %s will be replaced with
> - "(roughly %d steps)" translation */
> + /*
> + * TRANSLATORS: the last %s will be replaced with "(roughly %d
> + * steps)" translation.
> + */
Nice.
[...]
> +++ b/ref-filter.c
> @@ -1251,13 +1251,17 @@ char *get_head_description(void)
> state.branch);
> else if (state.detached_from) {
> if (state.detached_at)
> - /* TRANSLATORS: make sure this matches
> - "HEAD detached at " in wt-status.c */
> + /*
> + * TRANSLATORS: make sure this matches "HEAD
> + * detached at " in wt-status.c
> + */
optional: could treat "HEAD detached at " as an unbreakable phrase
for the sake of line-breaking, for easier grepping.
But what's here is also perfectly fine.
[...]
> - /* TRANSLATORS: make sure this matches
> - "HEAD detached from " in wt-status.c */
> + /*
> + * TRANSLATORS: make sure this matches "HEAD
> + * detached from " in wt-status.c
> + */
Likewise.
The rest also look good. This is great.
Thanks,
Jonathan
next prev parent reply other threads:[~2017-05-11 21:41 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 9:18 [PATCH 00/29] Easy to review grep & pre-PCRE changes Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 01/29] Makefile & configure: reword inaccurate comment about PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 02/29] grep & rev-list doc: stop promising libpcre for --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 03/29] test-lib: rename the LIBPCRE prerequisite to PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 04/29] log: add exhaustive tests for pattern style options & config Ævar Arnfjörð Bjarmason
2017-05-12 4:48 ` Junio C Hamano
2017-05-13 18:02 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 05/29] grep: add a test asserting that --perl-regexp dies when !PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 06/29] grep: add a test for backreferences in PCRE patterns Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 07/29] grep: change non-ASCII -i test to stop using --debug Ævar Arnfjörð Bjarmason
2017-05-11 18:31 ` Brandon Williams
2017-05-11 18:35 ` Ævar Arnfjörð Bjarmason
2017-05-11 20:05 ` Brandon Williams
2017-05-11 9:18 ` [PATCH 08/29] grep: add tests for --threads=N and grep.threads Ævar Arnfjörð Bjarmason
2017-05-11 18:36 ` Brandon Williams
2017-05-11 19:22 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 09/29] grep: amend submodule recursion test for regex engine testing Ævar Arnfjörð Bjarmason
2017-05-12 4:59 ` Junio C Hamano
2017-05-13 17:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 10/29] grep: add tests for grep pattern types being passed to submodules Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 11/29] grep: add a test helper function for less verbose -f \0 tests Ævar Arnfjörð Bjarmason
2017-05-12 5:06 ` Junio C Hamano
2017-05-13 11:33 ` Ævar Arnfjörð Bjarmason
2017-05-15 1:29 ` Junio C Hamano
2017-05-11 9:18 ` [PATCH 12/29] grep: prepare for testing binary regexes containing rx metacharacters Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 13/29] grep: add tests to fix blind spots with \0 patterns Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 14/29] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 15/29] perf: emit progress output when unpacking & building Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 16/29] perf: add a performance comparison test of grep -G, -E and -P Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 17/29] perf: add a performance comparison of fixed-string grep Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 18/29] grep: catch a missing enum in switch statement Ævar Arnfjörð Bjarmason
2017-05-11 20:08 ` Brandon Williams
2017-05-11 20:40 ` Stefan Beller
2017-05-11 20:50 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 19/29] grep: remove redundant regflags assignment under PCRE Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 20/29] grep: remove redundant `regflags &= ~REG_EXTENDED` assignments Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 21/29] grep: factor test for \0 in grep patterns into a function Ævar Arnfjörð Bjarmason
2017-05-11 20:15 ` Brandon Williams
2017-05-11 20:22 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 22/29] grep: change the internal PCRE macro names to be PCRE1 Ævar Arnfjörð Bjarmason
2017-05-11 20:10 ` Brandon Williams
2017-05-11 9:18 ` [PATCH 23/29] grep: change internal *pcre* variable & function names to be *pcre1* Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 24/29] grep: move two functions to avoid forward declaration Ævar Arnfjörð Bjarmason
2017-05-11 20:14 ` Brandon Williams
2017-05-11 20:20 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 25/29] test-lib: add a PTHREADS prerequisite Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 26/29] pack-objects & index-pack: add test for --threads warning Ævar Arnfjörð Bjarmason
2017-05-11 20:17 ` Brandon Williams
2017-05-11 20:34 ` Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 27/29] pack-objects: fix buggy warning about threads Ævar Arnfjörð Bjarmason
2017-05-11 9:18 ` [PATCH 28/29] grep: given --threads with NO_PTHREADS=YesPlease, warn Ævar Arnfjörð Bjarmason
2017-05-11 20:21 ` Brandon Williams
2017-05-11 20:33 ` Ævar Arnfjörð Bjarmason
2017-05-11 20:43 ` Brandon Williams
2017-05-11 21:20 ` [PATCH] C style: use standard style for "TRANSLATORS" comments Ævar Arnfjörð Bjarmason
2017-05-11 21:41 ` Jonathan Nieder [this message]
2017-05-11 21:50 ` Brandon Williams
2017-05-12 5:20 ` Johannes Sixt
2017-05-30 16:02 ` Jiang Xin
2017-05-30 23:03 ` Junio C Hamano
2017-05-11 9:18 ` [PATCH 29/29] grep: assert that threading is enabled when calling grep_{lock,unlock} Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170511214125.GB21723@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).