From 4470ef94973cf40bb83864d480cee1e064053879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Wed, 25 Apr 2012 18:21:53 +0700 Subject: help: replace underlining "help -a" headers using hyphens with a blank line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We used to underline a header text, like this: This is a header ---------------- content... But calculating text length so that the dashes align with the text could get complicated because the text could be in any charset in translated Git. There is no point to use this pseudo underline; simply a blank line would do and it even makes it easier to read: This is a header content... While at it, give translators more context to translate, e.g. e.g. "git commands available..." instead of "%s available..." Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/help.c | 2 +- help.c | 16 +++------------- help.h | 3 +-- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index 96a462cf1..e63668ade 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -425,7 +425,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) if (show_all) { printf(_("usage: %s%s"), _(git_usage_string), "\n\n"); - list_commands(_("git commands"), &main_cmds, &other_cmds); + list_commands(&main_cmds, &other_cmds); printf("%s\n", _(git_more_info_string)); return 0; } diff --git a/help.c b/help.c index 9e6e0f2ab..a39b7bf89 100644 --- a/help.c +++ b/help.c @@ -203,8 +203,7 @@ void load_command_list(const char *prefix, exclude_cmds(other_cmds, main_cmds); } -void list_commands(const char *title, struct cmdnames *main_cmds, - struct cmdnames *other_cmds) +void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds) { int i, longest = 0; @@ -217,23 +216,14 @@ void list_commands(const char *title, struct cmdnames *main_cmds, if (main_cmds->cnt) { const char *exec_path = git_exec_path(); - printf_ln(_("available %s in '%s'"), title, exec_path); - /* TRANSLATORS: this must align with "available %s in '%s'" */ - printf(_("----------------")); - mput_char('-', strlen(title) + strlen(exec_path)); + printf_ln(_("available git commands in '%s'"), exec_path); putchar('\n'); pretty_print_string_list(main_cmds, longest); putchar('\n'); } if (other_cmds->cnt) { - printf_ln(_("%s available from elsewhere on your $PATH"), title); - /* TRANSLATORS: - * this must align with - * "%s available from elsewhere on your $PATH" - */ - printf(_("---------------------------------------")); - mput_char('-', strlen(title)); + printf_ln(_("git commands available from elsewhere on your $PATH")); putchar('\n'); pretty_print_string_list(other_cmds, longest); putchar('\n'); diff --git a/help.h b/help.h index b6b12d575..dc406c8c5 100644 --- a/help.h +++ b/help.h @@ -25,8 +25,7 @@ extern void add_cmdname(struct cmdnames *cmds, const char *name, int len); /* Here we require that excludes is a sorted list. */ extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes); extern int is_in_cmdlist(struct cmdnames *cmds, const char *name); -extern void list_commands(const char *title, - struct cmdnames *main_cmds, +extern void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds); #endif /* HELP_H */ -- cgit v1.2.1