minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Fix detection of in-place path_locale when RUN_IN_PLACE=0 

* adress https://codeberg.org/minenux/minetest-engine/issues/20
* broken by 2349d31bae (side effect)
* https://github.com/minetest/minetest/issues/9745
stable-5.2-namespace
Герхард PICCORO Lenz McKAY 2021-11-30 17:04:39 -04:00
parent 4ef3bc602f
commit 2e72eabafe
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gettext.cpp
View File

@ -217,7 +217,8 @@ void init_gettext(const char *path, const std::string &configured_language,
#endif
#endif
static std::string name = lowercase(PROJECT_NAME + std::to_string(VERSION_MAJOR));
std::string name = lowercase(PROJECT_NAME + std::to_string(VERSION_MAJOR));
infostream << "Gettext: domainname=\"" << name << "\" path=\"" << path << "\"" << std::endl;
bindtextdomain(name.c_str(), path);
textdomain(name.c_str());

20
src/porting.cpp
View File

@ -599,18 +599,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");