We want the underline to align with the text above, for example:
This is a header
----------------
content...
Unfortunately calculating text length could get complicated because
the text could be in any charset in translated Git. Avoid it and print
a blank line (i.e. charset neutral) instead. Readability is not
affected much. After the change we get:
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 <pclouds@xxxxxxxxx>
---
2012/4/24 Jonathan Nieder <jrnieder@xxxxxxxxx>:
> Junio C Hamano wrote:
>
>> Wouldn't a simple
>> and clean "blank line" look better?
>
> Yes, based on a quick test with "vi" it looks reasonable. Thanks for
> a sanity check.
And it does _not_ assume the translated text is in utf-8.
And thanks Junio for fixing the other nit before merging the seriess
to next. I should have read and reacted on these posts yesterday.
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 96a462c..e63668a 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 9e6e0f2..baaf379 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 b6b12d5..dc406c8 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 */
--
1.7.8.36.g69ee2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html