tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default to UTF-8 on the mac, nl_langinfo(CODENAME) returns US-ASCII for desktop apps

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-09-23 16:44:43 +02:00
parent dd5cf808b5
commit 336dc0dc48
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/rclconfig.cpp
View File

@ -264,7 +264,11 @@ RclConfig::RclConfig(const string *argcnf)
// is called from the main thread at once, by constructing a config // is called from the main thread at once, by constructing a config
// from recollinit // from recollinit
if (o_localecharset.empty()) { if (o_localecharset.empty()) {
#ifndef _WIN32 #ifdef _WIN32
o_localecharset = winACPName();
#elif defined(__APPLE__)
o_localecharset = "UTF-8";
#else
const char *cp; const char *cp;
cp = nl_langinfo(CODESET); cp = nl_langinfo(CODESET);
// We don't keep US-ASCII. It's better to use a superset // We don't keep US-ASCII. It's better to use a superset
@ -282,8 +286,6 @@ RclConfig::RclConfig(const string *argcnf)
// Use cp1252 instead of iso-8859-1, it's a superset. // Use cp1252 instead of iso-8859-1, it's a superset.
o_localecharset = string(cstr_cp1252); o_localecharset = string(cstr_cp1252);
} }
#else
o_localecharset = winACPName();
#endif #endif
LOGDEB1("RclConfig::getDefCharset: localecharset [" << LOGDEB1("RclConfig::getDefCharset: localecharset [" <<
o_localecharset << "]\n"); o_localecharset << "]\n");