From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, gitster@pobox.com,
ramsay@ramsayjones.plus.com,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v9 17/20] ref-filter: allow porcelain to translate messages in the output
Date: Tue, 27 Dec 2016 21:53:54 +0530 [thread overview]
Message-ID: <20161227162357.28212-18-Karthik.188@gmail.com> (raw)
In-Reply-To: <20161227162357.28212-1-Karthik.188@gmail.com>
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. By default, keep
the messages untranslated, which is the right behavior for plumbing
commands. 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 | 29 +++++++++++++++++++++++++----
ref-filter.h | 2 ++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index dd7e751..e478ec6 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -16,6 +16,27 @@
#include "trailer.h"
#include "wt-status.h"
+static struct ref_msg {
+ const char *gone;
+ const char *ahead;
+ const char *behind;
+ const char *ahead_behind;
+} msgs = {
+ /* Untranslated plumbing messages: */
+ "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;
typedef enum { COMPARE_EQUAL, COMPARE_UNEQUAL, COMPARE_NONE } cmp_status;
@@ -1181,15 +1202,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 630e7c2..44b36ed 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -113,5 +113,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
next prev parent reply other threads:[~2016-12-27 16:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-27 16:23 [PATCH v9 00/20] port branch.c to use ref-filter's printing options Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 01/20] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-12-27 20:58 ` Junio C Hamano
2016-12-28 6:47 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 02/20] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-12-27 20:59 ` Junio C Hamano
2016-12-28 7:45 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 03/20] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-12-27 21:00 ` Junio C Hamano
2016-12-28 7:45 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 04/20] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 05/20] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 06/20] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 07/20] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 08/20] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 09/20] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 10/20] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 11/20] ref-filter: introduce refname_atom_parser() Karthik Nayak
2016-12-27 21:04 ` Junio C Hamano
2016-12-28 7:56 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 12/20] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 13/20] ref-filter: rename the 'strip' option to 'lstrip' Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 14/20] ref-filter: Do not abruptly die when using the 'lstrip=<N>' option Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 15/20] ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>' Karthik Nayak
2016-12-27 21:11 ` Junio C Hamano
2016-12-28 3:08 ` Jacob Keller
2016-12-28 8:54 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 16/20] ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames Karthik Nayak
2016-12-27 16:23 ` Karthik Nayak [this message]
2016-12-27 16:23 ` [PATCH v9 18/20] branch, tag: use porcelain output Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 19/20] branch: use ref-filter printing APIs Karthik Nayak
2016-12-27 21:17 ` Junio C Hamano
2016-12-28 9:40 ` Karthik Nayak
2016-12-27 16:23 ` [PATCH v9 20/20] branch: implement '--format' option 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
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=20161227162357.28212-18-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=ramsay@ramsayjones.plus.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).