aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gettext.cpp5
-rw-r--r--src/porting.cpp20
2 files changed, 14 insertions, 11 deletions
diff --git a/src/gettext.cpp b/src/gettext.cpp
index 81621ba89..6818004df 100644
--- a/src/gettext.cpp
+++ b/src/gettext.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());
diff --git a/src/porting.cpp b/src/porting.cpp
index 76fd592d6..c0381ad06 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -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");