Hi,
On Dec/25/2009, Vladimir '??-coder/phcoder' Serbinenko wrote:
> Now 'desclen' is out of sync with message
(arf, rushing for Christmas lunch :-) )
Now all cmd->summary and cmd->description in commands/help.c are
gettextizzed. I've reviewed lib/arg.c and was fine.
Thanks Vladimir,
--
Carles Pina i Estany
http://pinux.info
=== modified file 'commands/help.c'
--- commands/help.c 2009-06-10 21:04:23 +0000
+++ commands/help.c 2009-12-25 12:36:54 +0000
@@ -21,6 +21,7 @@
#include <grub/misc.h>
#include <grub/term.h>
#include <grub/extcmd.h>
+#include <grub/i18n.h>
static grub_err_t
grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
@@ -38,13 +39,13 @@ grub_cmd_help (grub_extcmd_t ext __attri
(cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
{
char description[GRUB_TERM_WIDTH / 2];
- int desclen = grub_strlen (cmd->summary);
+ int desclen = grub_strlen (_(cmd->summary));
/* Make a string with a length of GRUB_TERM_WIDTH / 2 - 1 filled
with the description followed by spaces. */
grub_memset (description, ' ', GRUB_TERM_WIDTH / 2 - 1);
description[GRUB_TERM_WIDTH / 2 - 1] = '\0';
- grub_memcpy (description, cmd->summary,
+ grub_memcpy (description, _(cmd->summary),
(desclen < GRUB_TERM_WIDTH / 2 - 1
? desclen : GRUB_TERM_WIDTH / 2 - 1));
@@ -65,8 +66,8 @@ grub_cmd_help (grub_extcmd_t ext __attri
if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
grub_arg_show_help ((grub_extcmd_t) cmd->data);
else
- grub_printf ("Usage: %s\n%s\b", cmd->summary,
- cmd->description);
+ grub_printf ("%s %s\n%s\b", _("Usage:"), _(cmd->summary),
+ _(cmd->description));
}
}
return 0;
@@ -94,8 +95,8 @@ GRUB_MOD_INIT(help)
{
cmd = grub_register_extcmd ("help", grub_cmd_help,
GRUB_COMMAND_FLAG_CMDLINE,
- "help [PATTERN ...]",
- "Show a help message.", 0);
+ N_("help [PATTERN ...]"),
+ N_("Show a help message."), 0);
}
GRUB_MOD_FINI(help)
_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
