vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-12-20 Carles Pina i Estany <carles@pina.cat>

Browse source 
* include/grub/auth.h: Include `<grub/i18n.h>'.
	(GRUB_GET_PASSWORD): Gettextizze string.
	* include/grub/normal.h (STANDARD_MARGIN): New macro, moved from
	menu_text.c.
	(grub_utf8_to_ucs4_alloc): Fix indentation.
	(grub_print_ucs4): Likewise.
	(grub_getstringwidth): Likewise.
	(print_message_indented): New declaration.
	* normal/auth.c: Include `<grub/i18n.h>'.
	(grub_auth_check_authentication): Gettexttize string.
	* normal/cmdline.c: Include `<grub/i18n.h>'.
	(grub_cmdline_get): Gettextizze.
	* normal/color.c: Include `<grub/i18n.h>'.
	(grub_parse_color_name_pair): Gettexttize strings.
	* normal/main.c (grub_normal_reader_init): Cleanup gettexttized
	string (use `print_message_indented').
	* normal/menu_text.c (STANDARD_MARGIN): Moved from here to
	`include/grub/normal.h'.
	(print_message_indented): Renamed to ...
	(grub_print_message_indented): ... this. Remove `static' qualifer (now
	used in normal/main.c).
	(print_message): Use `grub_print_message_indented' instead of
	`print_message_indented'.
	(print_timeout): Likewise.
	* normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
	(grub_normal_print_device_info): Gettexttize strings.
	* po/POTFILES: Add `auth.c', `color.c' and `misc.c'.
This commit is contained in:
carles 2009-12-20 23:32:15 +00:00
parent 3041d8989c
commit 7f39d92f8d
10 changed files with 95 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

31
normal/misc.c
View file

@ -1,7 +1,7 @@
/* misc.c - miscellaneous functions */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2007,2008 Free Software Foundation, Inc.
* Copyright (C) 2005,2007,2008,2009 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/datetime.h>
#include <grub/term.h>
#include <grub/i18n.h>
/* Print the information on the device NAME. */
grub_err_t
@ -34,13 +36,20 @@ grub_normal_print_device_info (const char *name)
p = grub_strchr (name, ',');
if (p)
grub_printf ("\tPartition %s: ", name);
{
grub_putchar ('\t');
grub_printf_ (N_("Partition %s:"), name);
grub_putchar (' ');
}
else
grub_printf ("Device %s: ", name);
{
grub_printf_ (N_("Device %s:"), name);
grub_putchar (' ');
}
dev = grub_device_open (name);
if (! dev)
grub_printf ("Filesystem cannot be accessed");
grub_printf ("%s", _("Filesystem cannot be accessed"));
else if (dev->disk)
{
grub_fs_t fs;
@ -51,7 +60,7 @@ grub_normal_print_device_info (const char *name)
if (fs)
{
grub_printf ("Filesystem type %s", fs->name);
grub_printf_ (N_("Filesystem type %s"), fs->name);
if (fs->label)
{
char *label;
@ -59,7 +68,7 @@ grub_normal_print_device_info (const char *name)
if (grub_errno == GRUB_ERR_NONE)
{
if (label && grub_strlen (label))
grub_printf (", Label %s", label);
grub_printf_ (N_("- Label %s"), label);
grub_free (label);
}
grub_errno = GRUB_ERR_NONE;
@ -72,8 +81,8 @@ grub_normal_print_device_info (const char *name)
if (grub_errno == GRUB_ERR_NONE)
{
grub_unixtime2datetime (tm, &datetime);
grub_printf (", Last modification time %d-%02d-%02d "
"%02d:%02d:%02d %s",
grub_printf_ (N_("- Last modification time %d-%02d-%02d "
"%02d:%02d:%02d %s"),
datetime.year, datetime.month, datetime.day,
datetime.hour, datetime.minute, datetime.second,
grub_get_weekday_name (&datetime));
@ -95,13 +104,13 @@ grub_normal_print_device_info (const char *name)
}
}
else if (! dev->disk->has_partitions || dev->disk->partition)
grub_printf ("Unknown filesystem");
grub_printf ("%s", _("Unknown filesystem"));
else
grub_printf ("Partition table");
grub_printf ("%s", _("Partition table"));
grub_device_close (dev);
}
grub_printf ("\n");
grub_putchar ('\n');
return grub_errno;
}