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

[PATCH 5/5] git-commit: remove lego in i18n messages

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 30, 2012, 15:33 UTC
Message-ID
<1335799995-7667-6-git-send-email-avarab@gmail.com>
In-Reply-To
<1335799995-7667-1-git-send-email-avarab@gmail.com>

Change the "Please enter the commit message for your changes." and the subsequent blurb of text not to be split up. This makes translating it much easier.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/commit.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index c7c491e..438f257 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -798,17 +798,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 					 : "CHERRY_PICK_HEAD"));
 
 		fprintf(s->fp, "\n");
-		status_printf(s, GIT_COLOR_NORMAL,
-			_("Please enter the commit message for your changes."));
 		if (cleanup_mode == CLEANUP_ALL)
-			status_printf_more(s, GIT_COLOR_NORMAL,
-				_(" Lines starting\n"
-				"with '#' will be ignored, and an empty"
+			status_printf(s, GIT_COLOR_NORMAL,
+				_("Please enter the commit message for your changes."
+				" Lines starting\nwith '#' will be ignored, and an empty"
 				" message aborts the commit.\n"));
 		else /* CLEANUP_SPACE, that is. */
-			status_printf_more(s, GIT_COLOR_NORMAL,
-				_(" Lines starting\n"
-				"with '#' will be kept; you may remove them"
+			status_printf(s, GIT_COLOR_NORMAL,
+				_("Please enter the commit message for your changes."
+				" Lines starting\nwith '#' will be kept; you may remove them"
 				" yourself if you want to.\n"
 				"An empty message aborts the commit.\n"));
 		if (only_include_assumed)
-- 
1.7.10.546.gbaa1a.dirty
Previous: Ævar Arnfjörð BjarmasonNext: Junio C Hamano
Message 10 of 12 in “i18n: TRANSLATORS commends and LEGO--”
  1. 0/5 i18n: TRANSLATORS commends and LEGO--Ævar Arnfjörð Bjarmason, Apr 30, 2012
  2. 1/5 diff: move TRANSLATORS comments so they're picked upÆvar Arnfjörð Bjarmason, Apr 30, 2012
  3. Junio C HamanoApr 30, 2012
  4. Ævar Arnfjörð BjarmasonApr 30, 2012
  5. 2/5 i18n: Add more TRANSLATORS commentsÆvar Arnfjörð Bjarmason, Apr 30, 2012
  6. Junio C HamanoApr 30, 2012
  7. 3/5 git-branch: remove lego in i18n messagesÆvar Arnfjörð Bjarmason, Apr 30, 2012
  8. Junio C HamanoApr 30, 2012
  9. 4/5 git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason, Apr 30, 2012
  10. 5/5 git-commit: remove lego in i18n messagesÆvar Arnfjörð Bjarmason, Apr 30, 2012
  11. Junio C HamanoApr 30, 2012
  12. Ævar Arnfjörð BjarmasonApr 30, 2012

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.