summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-04 09:55:44 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-04 09:55:44 +0900
commitc5da34c12481ff6edc3f46463cbf43efe856308e (patch)
tree1f6be27746458c6314427a3ba264db6341288151 /builtin/blame.c
parentfe3bf4cb526aa85941c30b6e9104e8b0a84094c3 (diff)
parent66f5f6dca95eda46bf02c8d06de8cb265995fd6e (diff)
downloadgit-c5da34c12481ff6edc3f46463cbf43efe856308e.tar.gz
Merge branch 'ab/c-translators-comment-style'
Update the C style recommendation for notes for translators, as recent versions of gettext tools can work with our style of multi-line comments. * ab/c-translators-comment-style: C style: use standard style for "TRANSLATORS" comments
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 1043e5376f..9cb9610115 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2688,12 +2688,15 @@ parse_done:
blame_date_width = sizeof("2006-10-19");
break;
case DATE_RELATIVE:
- /* TRANSLATORS: This string is used to tell us the maximum
- display width for a relative timestamp in "git blame"
- output. For C locale, "4 years, 11 months ago", which
- takes 22 places, is the longest among various forms of
- relative timestamps, but your language may need more or
- fewer display columns. */
+ /*
+ * TRANSLATORS: This string is used to tell us the
+ * maximum display width for a relative timestamp in
+ * "git blame" output. For C locale, "4 years, 11
+ * months ago", which takes 22 places, is the longest
+ * among various forms of relative timestamps, but
+ * your language may need more or fewer display
+ * columns.
+ */
blame_date_width = utf8_strwidth(_("4 years, 11 months ago")) + 1; /* add the null */
break;
case DATE_NORMAL: