diff options
Diffstat (limited to 'gettext-tools/src/msgcat.c')
| -rw-r--r-- | gettext-tools/src/msgcat.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index e0b31a3..b50e308 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -38,6 +38,9 @@ #include "basename.h" #include "message.h" #include "read-catalog.h" +#include "read-po.h" +#include "read-properties.h" +#include "read-stringtable.h" #include "write-catalog.h" #include "write-po.h" #include "write-properties.h" @@ -107,6 +110,7 @@ main (int argc, char **argv) const char *files_from; string_list_ty *file_list; msgdomain_list_ty *result; + catalog_input_format_ty input_syntax = &input_format_po; catalog_output_format_ty output_syntax = &output_format_po; bool sort_by_msgid = false; bool sort_by_filepos = false; @@ -205,7 +209,7 @@ main (int argc, char **argv) break; case 'P': - input_syntax = syntax_properties; + input_syntax = &input_format_properties; break; case 's': @@ -247,7 +251,7 @@ main (int argc, char **argv) break; case CHAR_MAX + 3: /* --stringtable-input */ - input_syntax = syntax_stringtable; + input_syntax = &input_format_stringtable; break; case CHAR_MAX + 4: /* --stringtable-output */ @@ -303,7 +307,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ /* Read input files, then filter, convert and merge messages. */ result = - catenate_msgdomain_list (file_list, + catenate_msgdomain_list (file_list, input_syntax, output_syntax->requires_utf8 ? "UTF-8" : to_code); string_list_free (file_list); |