Re: [PATCH v7 14/17] ref-filter: allow porcelain to translate messages in the output

From: Jacob Keller <jacob.keller@gmail.com>
Date: Nov 9, 2016, 00:00 UTC
Message-ID: <CA+P7+xo0yrafS0NxtCiDJqrU+Qbdjv7WEcdq9GK44bKt4pYagQ@mail.gmail.com>
In-Reply-To: <20161108201211.25213-15-Karthik.188@gmail.com>

On Tue, Nov 8, 2016 at 12:12 PM, Karthik Nayak <karthik.188@gmail.com> wrote:

Show 6 quoted lines

> From: Karthik Nayak <karthik.188@gmail.com>
>
> Introduce setup_ref_filter_porcelain_msg() so that the messages used in
> the atom %(upstream:track) can be translated if needed. This is needed
> as we port branch.c to use ref-filter's printing API's.
>

So any user that wants these translated calls setup_ref_filter_porcelain_msg but this will impact all callers from that point on. Ok, I think that's ok? Otherwise they get default without translation.

Show 75 quoted lines

> Written-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
> Mentored-by: Christian Couder <christian.couder@gmail.com>
> Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
> ---
>  ref-filter.c | 28 ++++++++++++++++++++++++----
>  ref-filter.h |  2 ++
>  2 files changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index b47b900..944671a 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -15,6 +15,26 @@
>  #include "version.h"
>  #include "wt-status.h"
>
> +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");
> +}
> +
>  typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
>
>  struct align {
> @@ -1130,15 +1150,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  */
> --
> 2.10.2
>