git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 12/15] ref-filter: allow porcelain to translate messages in the output

From
Karthik Nayak <karthik.188@gmail.com>
Date
Mar 6, 2016, 12:04 UTC
Message-ID
<1457265902-7949-13-git-send-email-Karthik.188@gmail.com>
In-Reply-To
<1457265902-7949-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 45f9d16..76ea7c3 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 {
@@ -1088,15 +1108,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.2
Previous: Karthik NayakNext: Karthik Nayak
Message 24 of 30 in “port branch.c to use ref-filter's printing options”
  1. 00/15 port branch.c to use ref-filter's printing optionsKarthik Nayak, Mar 6, 2016
  2. 01/15 ref-filter: implement %(if), %(then), and %(else) atomsKarthik Nayak, Mar 6, 2016
  3. 02/15 ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)Karthik Nayak, Mar 6, 2016
  4. Junio C HamanoMar 7, 2016
  5. Karthik NayakMar 8, 2016
  6. Junio C HamanoMar 8, 2016
  7. Karthik NayakMar 8, 2016
  8. 03/15 ref-filter: modify "%(objectname:short)" to take lengthKarthik Nayak, Mar 6, 2016
  9. 04/15 ref-filter: move get_head_description() from branch.cKarthik Nayak, Mar 6, 2016
  10. 05/15 ref-filter: introduce format_ref_array_item()Karthik Nayak, Mar 6, 2016
  11. 06/15 ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreamsKarthik Nayak, Mar 6, 2016
  12. Jacob KellerMar 8, 2016
  13. Karthik NayakMar 8, 2016
  14. 07/15 ref-filter: add support for %(upstream:track,nobracket)Karthik Nayak, Mar 6, 2016
  15. 08/15 ref-filter: make "%(symref)" atom work with the ':short' modifierKarthik Nayak, Mar 6, 2016
  16. Junio C HamanoMar 7, 2016
  17. Jacob KellerMar 8, 2016
  18. Karthik NayakMar 8, 2016
  19. Junio C HamanoMar 8, 2016
  20. Karthik NayakMar 9, 2016
  21. 09/15 ref-filter: introduce symref_atom_parser()Karthik Nayak, Mar 6, 2016
  22. 10/15 ref-filter: introduce refname_atom_parser()Karthik Nayak, Mar 6, 2016
  23. 11/15 ref-filter: add support for %(refname:dir) and %(refname:base)Karthik Nayak, Mar 6, 2016
  24. 12/15 ref-filter: allow porcelain to translate messages in the outputKarthik Nayak, Mar 6, 2016
  25. 13/15 branch, tag: use porcelain outputKarthik Nayak, Mar 6, 2016
  26. 14/15 branch: use ref-filter printing APIsKarthik Nayak, Mar 6, 2016
  27. Junio C HamanoMar 7, 2016
  28. 15/15 branch: implement '--format' optionKarthik Nayak, Mar 6, 2016
  29. Jacob KellerMar 8, 2016
  30. Karthik NayakMar 15, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.