Re: [PATCH] i18n: git-commit whence_s "merge/cherry-pick" message
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] i18n: git-commit whence_s "merge/cherry-pick" message · Jiang Xin <hidden>
Jiang Xin [off-list ref] writes:
quoted hunk
Mark the "merge/cherry-pick" messages in whence_s for translation. These messages returned from whence_s function are used as argument to build other messages. Signed-off-by: Jiang Xin <redacted> --- builtin/commit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/builtin/commit.c b/builtin/commit.c index eba137..663e1 100644 --- a/builtin/commit.c +++ b/builtin/commit.c@@ -202,10 +202,10 @@ static const char *whence_s(void) case FROM_COMMIT: break; case FROM_MERGE: - s = "merge"; + s = _("merge"); break; case FROM_CHERRY_PICK: - s = "cherry-pick"; + s = _("cherry-pick"); break; }
builtin/commit.c: In function 'whence_s': builtin/commit.c:206: error: assignment discards qualifiers from pointer target type builtin/commit.c:209: error: assignment discards qualifiers from pointer target type I'll squash the following in. Thanks. builtin/commit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 663e1fd..470b4a4 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c@@ -196,7 +196,7 @@ static void determine_whence(struct wt_status *s) static const char *whence_s(void) { - char *s = ""; + const char *s = ""; switch (whence) { case FROM_COMMIT: