# [PATCH] i18n: git-commit whence_s "merge/cherry-pick" message

2 messages from 2012-02-01 to 2012-02-01. Participants: Jiang Xin, Junio C Hamano.
Thread: https://gitlist.dev/t/29501

## Jiang Xin, 2012-02-01 17:20

Subject: [PATCH] i18n: git-commit whence_s "merge/cherry-pick" message
Message-ID: <1328116830-61290-1-git-send-email-worldhello.net@gmail.com>
URL: https://gitlist.dev/e/1328116830-61290-1-git-send-email-worldhello.net%40gmail.com

```
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 <worldhello.net@gmail.com>
---
 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;
 	}
 
-- 
1.7.9.3.g1fbd7

```

## Junio C Hamano, 2012-02-01 23:46

Subject: Re: [PATCH] i18n: git-commit whence_s "merge/cherry-pick" message
Message-ID: <7vpqdy15ir.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vpqdy15ir.fsf%40alter.siamese.dyndns.org
In-Reply-To: <1328116830-61290-1-git-send-email-worldhello.net@gmail.com>

```
Jiang Xin <worldhello.net@gmail.com> writes:

> 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 <worldhello.net@gmail.com>
> ---
>  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:

```