mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
Fix detection of in-place path_locale when RUN_IN_PLACE=0
broken by 2349d31bae1bfc4d58fd88efbc88261e69b11dad (side effect) fixes #9745
This commit is contained in:
parent
13a8ea2dac
commit
ca8957f500
@ -217,7 +217,10 @@ void init_gettext(const char *path, const std::string &configured_language,
|
||||
#endif
|
||||
#endif
|
||||
|
||||
static std::string name = lowercase(PROJECT_NAME);
|
||||
std::string name = lowercase(PROJECT_NAME);
|
||||
infostream << "Gettext: domainname=\"" << name
|
||||
<< "\" path=\"" << path << "\"" << std::endl;
|
||||
|
||||
bindtextdomain(name.c_str(), path);
|
||||
textdomain(name.c_str());
|
||||
|
||||
|
@ -598,18 +598,18 @@ void initializePaths()
|
||||
#if USE_GETTEXT
|
||||
bool found_localedir = false;
|
||||
# ifdef STATIC_LOCALEDIR
|
||||
if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) {
|
||||
/* STATIC_LOCALEDIR may be a generalized path such as /usr/share/locale that
|
||||
* doesn't necessarily contain our locale files, so check data path first. */
|
||||
path_locale = getDataPath("locale");
|
||||
if (fs::PathExists(path_locale)) {
|
||||
found_localedir = true;
|
||||
infostream << "Using in-place locale directory " << path_locale
|
||||
<< " even though a static one was provided." << std::endl;
|
||||
} else if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) {
|
||||
found_localedir = true;
|
||||
path_locale = STATIC_LOCALEDIR;
|
||||
infostream << "Using locale directory " << STATIC_LOCALEDIR << std::endl;
|
||||
} else {
|
||||
path_locale = getDataPath("locale");
|
||||
if (fs::PathExists(path_locale)) {
|
||||
found_localedir = true;
|
||||
infostream << "Using in-place locale directory " << path_locale
|
||||
<< " even though a static one was provided "
|
||||
<< "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl;
|
||||
}
|
||||
infostream << "Using static locale directory " << STATIC_LOCALEDIR
|
||||
<< std::endl;
|
||||
}
|
||||
# else
|
||||
path_locale = getDataPath("locale");
|
||||
|
Loading…
Reference in New Issue
Block a user