Pass the gettext() function to libcom_err

For those e2fsprogs programs which use libcom_err and are
internationalized, pass the gettext() function to libcom_err during
program initialization.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index c95cadd..2f4c232 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1120,6 +1120,7 @@ int main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        my_ver = ext2fs_parse_version_string(my_ver_string);
        lib_ver = ext2fs_get_library_version(0, &lib_ver_date);

diff --git a/misc/badblocks.c b/misc/badblocks.c
index 168d93e..5788241 100644 (file)
--- a/misc/badblocks.c
+++ b/misc/badblocks.c
@@ -1056,6 +1056,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        srandom((unsigned int)time(NULL));  /* simple randomness is enough */
        test_func = test_ro;

diff --git a/misc/chattr.c b/misc/chattr.c
index 69aaed1..8a2d61f 100644 (file)
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -301,6 +301,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index df241c2..5b114e9 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -507,6 +507,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        add_error_table(&et_ext2_error_table);
        fprintf (stderr, "dumpe2fs %s (%s)\n", E2FSPROGS_VERSION,

diff --git a/misc/e2image.c b/misc/e2image.c
index 4cd834a..c108a7a 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -1236,6 +1236,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        fprintf (stderr, "e2image %s (%s)\n", E2FSPROGS_VERSION,
                 E2FSPROGS_DATE);

diff --git a/misc/e2initrd_helper.c b/misc/e2initrd_helper.c
index c98a07a..b2f39bc 100644 (file)
--- a/misc/e2initrd_helper.c
+++ b/misc/e2initrd_helper.c
@@ -306,6 +306,7 @@ static void PRS(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt(argc, argv, "rv")) != EOF) {

diff --git a/misc/e2undo.c b/misc/e2undo.c
index c968f91..f97ddc2 100644 (file)
--- a/misc/e2undo.c
+++ b/misc/e2undo.c
@@ -135,6 +135,7 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        add_error_table(&et_ext2_error_table);
 

diff --git a/misc/findsuper.c b/misc/findsuper.c
index e3baf2e..6b5e16f 100644 (file)
--- a/misc/findsuper.c
+++ b/misc/findsuper.c
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt (argc, argv, "j")) != EOF) {

diff --git a/misc/lsattr.c b/misc/lsattr.c
index 1f55db3..e5e5969 100644 (file)
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -167,6 +167,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index c439e37..b33ad60 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2211,6 +2211,7 @@ int main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        PRS(argc, argv);
 

diff --git a/misc/partinfo.c b/misc/partinfo.c
index 4966074..c461e80 100644 (file)
--- a/misc/partinfo.c
+++ b/misc/partinfo.c
@@ -35,6 +35,7 @@ int main(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc == 1) {
                fprintf(stderr, _("Usage:  %s device...\n\nPrints out the "

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 88e814b..36368fb 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1852,6 +1852,7 @@ int main(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
        if (argc && *argv)
                program_name = *argv;

diff --git a/misc/uuidgen.c b/misc/uuidgen.c
index f181d19..1dbac8c 100644 (file)
--- a/misc/uuidgen.c
+++ b/misc/uuidgen.c
@@ -46,6 +46,7 @@ main (int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        while ((c = getopt (argc, argv, "tr")) != EOF)

diff --git a/resize/main.c b/resize/main.c
index 659a923..e6e9e7b 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -181,6 +181,7 @@ int main (int argc, char ** argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
+       set_com_err_gettext(gettext);
 #endif
 
        add_error_table(&et_ext2_error_table);