X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=cff8608f049337a143c1dca78265807dfc7bcdad;hb=706c9bfcdfc8d16c3a65243d708af135c2e7c894;hp=9a27c187f9867f56454e51cfc53f7ed69a620edb;hpb=afa899b84bdecf41c1ea5e888967e51b2444e669;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 9a27c18..cff8608 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_debug_print(_("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_debug_print(_("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_debug_print(_("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_debug_print(_("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_debug_print(_("Two-byte encoding, low-high, with BOM"));
     return TWO_BYTE_LOHI;
   }
   else {
-    gedcom_message("Unknown encoding, falling back to one-byte");
+    gedcom_warning(_("Unknown encoding, falling back to one-byte"));
     fseek(f, 0, 0);
     return ONE_BYTE;
   }
@@ -108,22 +108,33 @@ 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);
+  bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING);
+  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'"), 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)) {
+      line_no = 1;
+      result = gedcom_parse();
+    }
+    lexer_close();
+    fclose(file);
   }
-  lexer_close();
-  fclose(file);
-  
+
+  textdomain(save_textdom);
   return result;
 }