X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=cff8608f049337a143c1dca78265807dfc7bcdad;hb=35f77ce6bd3ccc27047eda0b3ef8d74c7a86c3d7;hp=b7becba94c7d6bf8d8012614e18e1f034f62014e;hpb=b087de94b5d04bd40afb9d39c8c46c5ab30bace7;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index b7becba..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;
   }
@@ -114,18 +114,20 @@ int gedcom_parse_file(char* file_name)
   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);
+    gedcom_error(_("Could not open file '%s'"), file_name);
   }
   else {
     init_encodings();
     enc = determine_encoding(file);
     
     if (lexer_init(enc, file)) {
+      line_no = 1;
       result = gedcom_parse();
     }
     lexer_close();