From a44393e43a39d2b78ff6673fc646be44698c9d37 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Fri, 19 Feb 2016 19:55:31 -0500
Subject: [PATCH] Don't print locale directory error message when GetText is
disabled
Also, downgrade the error to a warning.
---
src/porting.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/porting.cpp b/src/porting.cpp
index fd1915b0d..98b85b7d0 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -558,8 +558,9 @@ void initializePaths()
infostream << "Detected user path: " << path_user << std::endl;
infostream << "Detected cache path: " << path_cache << std::endl;
+#ifdef USE_GETTEXT
bool found_localedir = false;
-#ifdef STATIC_LOCALEDIR
+# ifdef STATIC_LOCALEDIR
if (STATIC_LOCALEDIR[0] && fs::PathExists(STATIC_LOCALEDIR)) {
found_localedir = true;
path_locale = STATIC_LOCALEDIR;
@@ -573,15 +574,16 @@ void initializePaths()
<< "(RUN_IN_PLACE or CUSTOM_LOCALEDIR)." << std::endl;
}
}
-#else
+# else
path_locale = getDataPath("locale");
if (fs::PathExists(path_locale)) {
found_localedir = true;
}
-#endif
+# endif
if (!found_localedir) {
- errorstream << "Couldn't find a locale directory!" << std::endl;
+ warningstream << "Couldn't find a locale directory!" << std::endl;
}
+#endif // USE_GETTEXT
}
--
GitLab