projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for reading Gnumeric spreadsheet files.
[pspp-builds.git]
/
src
/
libpspp
/
i18n.c
diff --git
a/src/libpspp/i18n.c
b/src/libpspp/i18n.c
index d194634f654dfca804cfd5d22b29e57b46f42966..ba083fffe2f1a791dca465bd0c4a17b59b4cc63c 100644
(file)
--- a/
src/libpspp/i18n.c
+++ b/
src/libpspp/i18n.c
@@
-177,6
+177,9
@@
set_pspp_locale (const char *l)
iconv_close (convertor[CONV_SYSTEM_TO_PSPP]);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
iconv_close (convertor[CONV_SYSTEM_TO_PSPP]);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, current_charset);
+
+ iconv_close (convertor[CONV_UTF8_TO_PSPP]);
+ convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
}
void
}
void
@@
-188,8
+191,9
@@
i18n_init (void)
setlocale (LC_CTYPE, locale);
charset = locale_charset ();
setlocale (LC_CTYPE, locale);
charset = locale_charset ();
- convertor[CONV_PSPP_TO_UTF8] = create_iconv ("UTF-8", charset);
+ convertor[CONV_PSPP_TO_UTF8]
= create_iconv ("UTF-8", charset);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
convertor[CONV_SYSTEM_TO_PSPP] = create_iconv (charset, charset);
+ convertor[CONV_UTF8_TO_PSPP] = create_iconv (charset, "UTF-8");
}
}