{"thread":{"id":"31458","subject":"[PATCH] status: remove i18n legos","startedAt":"2012-09-06T15:16:50Z","lastAt":"2012-09-06T15:16:50Z","messageCount":1,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"198455","messageId":"1346944610-15815-1-git-send-email-pclouds@gmail.com","threadId":"31458","inReplyTo":null,"subject":"[PATCH] status: remove i18n legos","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2012-09-06T15:16:50Z","receivedAt":"2012-09-06T15:16:50Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\"%s files\" gives no sense what \"%s\" might be. Give translators full\nphrases.\n\n\"blah blah blah%s\\n\" where %s is another sentence does not show the real\nlength of full line. As a result, l10n messages may exceed 80 columns\nunintentionally. Make it two sentences.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n wt-status.c | 48 ++++++++++++++++++++++++++++--------------------\n 1 file changed, 28 insertions(+), 20 deletions(-)\n\ndiff --git a/wt-status.c b/wt-status.c\nindex c110cbc..4eeaf23 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -221,7 +221,7 @@ static void wt_status_print_other_header(struct wt_status *s,\n \t\t\t\t\t const char *how)\n {\n \tconst char *c = color(WT_STATUS_HEADER, s);\n-\tstatus_printf_ln(s, c, _(\"%s files:\"), what);\n+\tstatus_printf_ln(s, c, \"%s:\", what);\n \tif (!advice_status_hints)\n \t\treturn;\n \tstatus_printf_ln(s, c, _(\"  (use \\\"git %s <file>...\\\" to include in what will be committed)\"), how);\n@@ -1008,9 +1008,9 @@ void wt_status_print(struct wt_status *s)\n \t\twt_status_print_submodule_summary(s, 1);  /* unstaged */\n \t}\n \tif (s->show_untracked_files) {\n-\t\twt_status_print_other(s, &s->untracked, _(\"Untracked\"), \"add\");\n+\t\twt_status_print_other(s, &s->untracked, _(\"Untracked files\"), \"add\");\n \t\tif (s->show_ignored_files)\n-\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored\"), \"add -f\");\n+\t\t\twt_status_print_other(s, &s->ignored, _(\"Ignored files\"), \"add -f\");\n \t} else if (s->commitable)\n \t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, _(\"Untracked files not listed%s\"),\n \t\t\tadvice_status_hints\n@@ -1023,23 +1023,31 @@ void wt_status_print(struct wt_status *s)\n \t\t\tstatus_printf_ln(s, GIT_COLOR_NORMAL, _(\"No changes\"));\n \t\telse if (s->nowarn)\n \t\t\t; /* nothing */\n-\t\telse if (s->workdir_dirty)\n-\t\t\tprintf(_(\"no changes added to commit%s\\n\"),\n-\t\t\t\tadvice_status_hints\n-\t\t\t\t? _(\" (use \\\"git add\\\" and/or \\\"git commit -a\\\")\") : \"\");\n-\t\telse if (s->untracked.nr)\n-\t\t\tprintf(_(\"nothing added to commit but untracked files present%s\\n\"),\n-\t\t\t\tadvice_status_hints\n-\t\t\t\t? _(\" (use \\\"git add\\\" to track)\") : \"\");\n-\t\telse if (s->is_initial)\n-\t\t\tprintf(_(\"nothing to commit%s\\n\"), advice_status_hints\n-\t\t\t\t? _(\" (create/copy files and use \\\"git add\\\" to track)\") : \"\");\n-\t\telse if (!s->show_untracked_files)\n-\t\t\tprintf(_(\"nothing to commit%s\\n\"), advice_status_hints\n-\t\t\t\t? _(\" (use -u to show untracked files)\") : \"\");\n-\t\telse\n-\t\t\tprintf(_(\"nothing to commit%s\\n\"), advice_status_hints\n-\t\t\t\t? _(\" (working directory clean)\") : \"\");\n+\t\telse if (s->workdir_dirty) {\n+\t\t\tif (advice_status_hints)\n+\t\t\t\tprintf(_(\"no changes added to commit \"\n+\t\t\t\t\t \"(use \\\"git add\\\" and/or \\\"git commit -a\\\")\\n\"));\n+\t\t\telse\n+\t\t\t\tprintf(_(\"no changes added to commit\\n\"));\n+\t\t} else if (s->untracked.nr) {\n+\t\t\tif (advice_status_hints)\n+\t\t\t\tprintf(_(\"nothing added to commit but untracked files \"\n+\t\t\t\t\t \"present (use \\\"git add\\\" to track)\\n\"));\n+\t\t\telse\n+\t\t\t\tprintf(_(\"nothing added to commit but untracked files present\\n\"));\n+\t\t} else if (s->is_initial) {\n+\t\t\tif (advice_status_hints)\n+\t\t\t\tprintf(_(\"nothing to commit (create/copy files \"\n+\t\t\t\t\t \"and use \\\"git add\\\" to track)\\n\"));\n+\t\t\telse\n+\t\t\t\tprintf(_(\"nothing to commit\\n\"));\n+\t\t} else if (!s->show_untracked_files) {\n+\t\t\tif (advice_status_hints)\n+\t\t\t\tprintf(_(\"nothing to commit (use -u to show untracked files)\\n\"));\n+\t\t\telse\n+\t\t\t\tprintf(_(\"nothing to commit\\n\"));\n+\t\t} else\n+\t\t\tprintf(_(\"nothing to commit, working directory clean\\n\"));\n \t}\n }\n \n-- \n1.7.12.rc2.18.g61b472e\n"}]}