BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Don't print locale directory error message when GetText is disabled

Browse Source 
Also, downgrade the error to a warning.
This commit is contained in:
ShadowNinja 2016-02-19 19:55:31 -05:00
parent 1b9aef43c9
commit a44393e43a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/porting.cpp
View File

@ -558,8 +558,9 @@ void initializePaths()
infostream << "Detected user path: " << path_user << std::endl; infostream << "Detected user path: " << path_user << std::endl;
infostream << "Detected cache path: " << path_cache << std::endl; infostream << "Detected cache path: " << path_cache << std::endl;
#ifdef USE_GETTEXT
bool found_localedir = false; bool found_localedir = false;
#ifdef STATIC_LOCALEDIR # ifdef STATIC_LOCALEDIR
if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) { if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) {
found_localedir = true; found_localedir = true;
path_locale = STATIC_LOCALEDIR; path_locale = STATIC_LOCALEDIR;
@ -573,15 +574,16 @@ void initializePaths()
<< "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl; << "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl;
} }
} }
#else # else
path_locale = getDataPath("locale"); path_locale = getDataPath("locale");
if (fs::PathExists(path_locale)) { if (fs::PathExists(path_locale)) {
found_localedir = true; found_localedir = true;
} }
#endif # endif
if (!found_localedir) { if (!found_localedir) {
errorstream << "Couldn't find a locale directory!" << std::endl; warningstream << "Couldn't find a locale directory!" << std::endl;
} }
#endif // USE_GETTEXT
} }