From: ShadowNinja <shadowninja@minetest.net>
Date: Sat, 20 Feb 2016 00:55:31 +0000 (-0500)
Subject: Don't print locale directory error message when GetText is disabled
X-Git-Tag: 0.4.14~251
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a44393e43a39d2b78ff6673fc646be44698c9d37;p=oweals%2Fminetest.git

Don't print locale directory error message when GetText is disabled

Also, downgrade the error to a warning.
---

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
 }