All of lore.kernel.org
 help / color / mirror / Atom feed
From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jacob.keller@gmail.com,
	Karthik Nayak <Karthik.188@gmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output
Date: Wed, 30 Mar 2016 15:09:57 +0530	[thread overview]
Message-ID: <1459330800-12525-14-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1459330800-12525-1-git-send-email-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.

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 73e0a7f..3435df1 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 {
@@ -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  */
-- 
2.7.4

  parent reply	other threads:[~2016-03-30  9:41 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 ` Karthik Nayak [this message]
2016-03-30 21:58   ` [PATCH v3 13/16] ref-filter: allow porcelain to translate messages in the output Junio C Hamano
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=1459330800-12525-14-git-send-email-Karthik.188@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.