Skip to content
Permalink
Browse files

Fix detection of in-place path_locale when RUN_IN_PLACE=0

broken by 2349d31 (side effect)
fixes #9745
  • Loading branch information
sfan5 committed Apr 27, 2020
1 parent 13a8ea2 commit ca8957f500980849fbd3e0c05b7cf3272b18ac97
Showing with 14 additions and 11 deletions.
  1. +4 −1 src/gettext.cpp
  2. +10 −10 src/porting.cpp
@@ -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");

0 comments on commit ca8957f

Please sign in to comment.