From b087de94b5d04bd40afb9d39c8c46c5ab30bace7 Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Tue, 11 Dec 2001 21:04:32 +0000 Subject: [PATCH] Initialize the textdomain for gettext (and restore at end of gedcom-parse-file function). Added gettext calls. --- gedcom/multilex.c | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/gedcom/multilex.c b/gedcom/multilex.c index 9a27c18..b7becba 100644 --- a/gedcom/multilex.c +++ b/gedcom/multilex.c @@ -71,34 +71,34 @@ int determine_encoding(FILE* f) fread(first, 1, 2, f); if ((first[0] == '0') && (first[1] == ' ')) { - gedcom_message("One-byte encoding"); + gedcom_message(_("One-byte encoding")); fseek(f, 0, 0); return ONE_BYTE; } else if ((first[0] == '\0') && (first[1] == '0')) { - gedcom_message("Two-byte encoding, high-low"); + gedcom_message(_("Two-byte encoding, high-low")); fseek(f, 0, 0); return TWO_BYTE_HILO; } else if ((first[0] == '\xFE') && (first[1] == '\xFF')) { - gedcom_message("Two-byte encoding, high-low, with BOM"); + gedcom_message(_("Two-byte encoding, high-low, with BOM")); return TWO_BYTE_HILO; } else if ((first[0] == '0') && (first[1] == '\0')) { - gedcom_message("Two-byte encoding, low-high"); + gedcom_message(_("Two-byte encoding, low-high")); fseek(f, 0, 0); return TWO_BYTE_LOHI; } else if ((first[0] == '\xFF') && (first[1] == '\xFE')) { - gedcom_message("Two-byte encoding, low-high, with BOM"); + gedcom_message(_("Two-byte encoding, low-high, with BOM")); return TWO_BYTE_LOHI; } else { - gedcom_message("Unknown encoding, falling back to one-byte"); + gedcom_message(_("Unknown encoding, falling back to one-byte")); fseek(f, 0, 0); return ONE_BYTE; } @@ -108,22 +108,31 @@ int gedcom_parse_file(char* file_name) { ENCODING enc; int result = 1; - FILE* file = fopen (file_name, "r"); + FILE* file; + + char *save_textdom = textdomain(NULL); + setlocale(LC_ALL, ""); /* In fact only necessary if main program doesn't + do this */ + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + line_no = 1; + file = fopen(file_name, "r"); if (!file) { - gedcom_error("Could not open file '%s'\n", file_name); - return 1; + gedcom_error(_("Could not open file '%s'\n"), file_name); } - - init_encodings(); - enc = determine_encoding(file); - - if (lexer_init(enc, file)) { - result = gedcom_parse(); + else { + init_encodings(); + enc = determine_encoding(file); + + if (lexer_init(enc, file)) { + result = gedcom_parse(); + } + lexer_close(); + fclose(file); } - lexer_close(); - fclose(file); - + + textdomain(save_textdom); return result; } -- 2.30.2