From: Junio C Hamano <gitster@pobox•com>
To: Karthik Nayak <karthik.188@gmail•com>
Cc: git@vger•kernel.org, jacob.keller@gmail•com
Subject: Re: [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output
Date: Wed, 30 Mar 2016 14:58:21 -0700 [thread overview]
Message-ID: <xmqqa8lfsk5e.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1459330800-12525-14-git-send-email-Karthik.188@gmail.com> (Karthik Nayak's message of "Wed, 30 Mar 2016 15:09:57 +0530")
Karthik Nayak <karthik.188@gmail•com> writes:
> +static struct ref_msg {
> + const char *gone;
> + const char *ahead;
> + const char *behind;
> + const char *ahead_behind;
> +} msgs = {
> + "gone",
> + "ahead %d",
> + "behind %d",
> + "ahead %d, behind %d"
> +};
> +
> +void setup_ref_filter_porcelain_msg(void)
> +{
> + msgs.gone = _("gone");
> + msgs.ahead = _("ahead %d");
> + msgs.behind = _("behind %d");
> + msgs.ahead_behind = _("ahead %d, behind %d");
> +}
I do not think this patch is wrong, but I wonder if it would be
sufficient to have a single bit in file-scope static variable and
flip it in setup_ref_filter_porcelain_msg(). I.e.
static int use_porcelain_msg; /* false by default */
void setup_ref_filter_porcelain_msg(void)
{
use_porcelain_msg = 1;
}
static const char *P_(const char *msg)
{
return use_porcelain_msg ? _(msg) : msg;
}
and then mark the message up perhaps like so:
- *s = xstrdup("gone");
+ *s = xstrdup(P_("gone"));
which may make things much simpler.
We'd need to update Makefile to recognize X_() as another keyword;
I'd think something like this should do:
XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
- --keyword=_ --keyword=N_ --keyword="Q_:1,2"
+ --keyword=_ --keyword=N_ --keyword=P_ --keyword="Q_:1,2"
> typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
>
> struct align {
> @@ -1097,15 +1117,15 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
> else if (atom->u.remote_ref.option == RR_TRACK) {
> if (stat_tracking_info(branch, &num_ours,
> &num_theirs, NULL)) {
> - *s = xstrdup("gone");
> + *s = xstrdup(msgs.gone);
> } else if (!num_ours && !num_theirs)
> *s = "";
> else if (!num_ours)
> - *s = xstrfmt("behind %d", num_theirs);
> + *s = xstrfmt(msgs.behind, num_theirs);
> else if (!num_theirs)
> - *s = xstrfmt("ahead %d", num_ours);
> + *s = xstrfmt(msgs.ahead, num_ours);
> else
> - *s = xstrfmt("ahead %d, behind %d",
> + *s = xstrfmt(msgs.ahead_behind,
> num_ours, num_theirs);
> if (!atom->u.remote_ref.nobracket && *s[0]) {
> const char *to_free = *s;
> diff --git a/ref-filter.h b/ref-filter.h
> index 0014b92..da17145 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -111,5 +111,7 @@ struct ref_sorting *ref_default_sorting(void);
> int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
> /* Get the current HEAD's description */
> char *get_head_description(void);
> +/* Set up translated strings in the output. */
> +void setup_ref_filter_porcelain_msg(void);
>
> #endif /* REF_FILTER_H */
next prev parent reply other threads:[~2016-03-30 21:58 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 9:39 [PATCH v3 00/16] port branch.c to use ref-filter's printing options Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 01/16] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 02/16] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-03-30 22:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 03/16] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 04/16] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 05/16] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-03-30 22:16 ` Junio C Hamano
2016-04-01 18:41 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 06/16] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 07/16] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 08/16] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 09/16] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-03-30 22:17 ` Junio C Hamano
2016-04-01 18:13 ` Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 10/16] ref-filter: introduce symref_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 11/16] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 12/16] ref-filter: add support for %(refname:dir) and %(refname:base) Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-03-30 21:58 ` Junio C Hamano [this message]
2016-04-01 19:00 ` Karthik Nayak
2016-04-04 8:05 ` Matthieu Moy
2016-04-04 16:12 ` Junio C Hamano
2016-03-30 9:39 ` [PATCH v3 14/16] branch, tag: use porcelain output Karthik Nayak
2016-03-30 9:39 ` [PATCH v3 15/16] branch: use ref-filter printing APIs Karthik Nayak
2016-03-30 9:40 ` [PATCH v3 16/16] branch: implement '--format' option Karthik Nayak
2016-03-30 22:19 ` [PATCH v3 00/16] port branch.c to use ref-filter's printing options Junio C Hamano
2016-04-01 13:31 ` Dennis Kaarsemaker
2016-04-01 13:44 ` Dennis Kaarsemaker
2016-04-01 15:15 ` Ramsay Jones
2016-04-01 19:42 ` Karthik Nayak
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa8lfsk5e.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jacob.keller@gmail$(echo .)com \
--cc=karthik.188@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox