Jiang Xin <worldhello.net@xxxxxxxxx> writes:
> When extract l10n messages, we use "--add-comments" option to keep
> comments right above the l10n messages for references. But sometimes
> irrelevant comments are also extracted. For example in the following
> code block, the comment in line 2 will be extracted as comment for the
> l10n message in line 3, but obviously it's wrong.
>
> { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
> NULL /* takes no arguments */,
> N_("ignore paths removed in the working tree (same as
> --no-all)"),
> PARSE_OPT_NOARG, ignore_removal_cb },
>
> Since almost all comments for l10n translators are marked with the same
> prefix (tag): "TRANSLATORS:", it's safe to only extract comments with
> this special tag. I.E. it's better to call xgettext as:
>
> xgettext --add-comments=TRANSLATORS: ...
>
> Also tweaks the multi-line comment in "init-db.c", to make it start with
> the proper tag, not "* TRANSLATORS:" (which has a star before the tag).
Hmph.
I am not very happy with this change, as it would force us to
special case "Translators" comment to follow a non-standard
multi-line comment formatting convention. Is there a way to tell
xgettext to accept both of these forms?
/* TRANSLATORS: this is a short comment to help you */
_("foo bar");
/*
* TRANSLATORS: this comment is to help you, but it is
* a lot longer to fit on just a single line.
*/
_("bar baz");
>
> Signed-off-by: Jiang Xin <worldhello.net@xxxxxxxxx>
> ---
> Makefile | 2 +-
> builtin/init-db.c | 8 +++-----
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 2128ce3..a53f3a8 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2102,7 +2102,7 @@ pdf:
>
> XGETTEXT_FLAGS = \
> --force-po \
> - --add-comments \
> + --add-comments=TRANSLATORS: \
> --msgid-bugs-address="Git Mailing List <git@xxxxxxxxxxxxxxx>" \
> --from-code=UTF-8
> XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
> diff --git a/builtin/init-db.c b/builtin/init-db.c
> index c7c76bb..56f85e2 100644
> --- a/builtin/init-db.c
> +++ b/builtin/init-db.c
> @@ -412,11 +412,9 @@ int init_db(const char *template_dir, unsigned int flags)
> if (!(flags & INIT_DB_QUIET)) {
> int len = strlen(git_dir);
>
> - /*
> - * TRANSLATORS: The first '%s' is either "Reinitialized
> - * existing" or "Initialized empty", the second " shared" or
> - * "", and the last '%s%s' is the verbatim directory name.
> - */
> + /* TRANSLATORS: The first '%s' is either "Reinitialized
> + existing" or "Initialized empty", the second " shared" or
> + "", and the last '%s%s' is the verbatim directory name. */
> printf(_("%s%s Git repository in %s%s\n"),
> reinit ? _("Reinitialized existing") : _("Initialized empty"),
> shared_repository ? _(" shared") : "",
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html