From 645e2086734e3d2d1ec95f50faa39f0f24304761 Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Mon, 24 Aug 2015 14:32:15 -0400
Subject: Use CUSTOM_LOCALEDIR if specified

---
 src/porting.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/porting.cpp')

diff --git a/src/porting.cpp b/src/porting.cpp
index cb9f3270b..5fea1d9cf 100644
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -136,6 +136,8 @@ void signal_handler_init(void)
 // Default to RUN_IN_PLACE style relative paths
 std::string path_share = "..";
 std::string path_user = "..";
+std::string path_locale = path_share + DIR_DELIM + "locale";
+
 
 std::string getDataPath(const char *subpath)
 {
@@ -503,13 +505,17 @@ void initializePaths()
 		path_share = execpath;
 		path_user  = execpath;
 	}
-
 #else
 	infostream << "Using system-wide paths (NOT RUN_IN_PLACE)" << std::endl;
 
 	if (!setSystemPaths())
 		errorstream << "Failed to get one or more system-wide path" << std::endl;
 
+#endif
+#ifdef STATIC_LOCALEDIR
+	path_locale = STATIC_LOCALEDIR[0] ? STATIC_LOCALEDIR : getDataPath("locale");
+#else
+	path_locale = getDataPath("locale");
 #endif
 
 	infostream << "Detected share path: " << path_share << std::endl;
-- 
cgit v1.2.3