nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FbTk/I18n.cc: Constructor should also check defined(NLS)

Browse source
This commit is contained in:
Ryan Pavlik 2011-10-28 11:59:28 -05:00
parent 1ba4fbe878
commit f47ed1be51
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FbTk/I18n.cc
View file

@ -72,17 +72,17 @@ void NLSInit(const char *catalog) {
I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)(-1)) {
#ifdef HAVE_SETLOCALE
#if defined(HAVE_SETLOCALE) && defined(NLS)
//make sure we don't get 0 to m_locale string
char *temp = setlocale(LC_MESSAGES, "");
m_locale = ( temp ? temp : "");
if (m_locale.empty()) {
cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;
#endif // HAVE_SETLOCALE
#endif // defined(HAVE_SETLOCALE) && defined(NLS)
m_locale = "C";
#ifdef HAVE_SETLOCALE
#if defined(HAVE_SETLOCALE) && defined(NLS)
} else {
@ -102,7 +102,7 @@ I18n::I18n():m_multibyte(false), m_utf8_translate(false), m_catalog_fd((nl_catd)
if (index != string::npos)
m_locale.erase(0,index+1); //erase all characters starting up to index
}
#endif // HAVE_SETLOCALE
#endif // defined(HAVE_SETLOCALE) && defined(NLS)
}