[sword-svn] r3631 - trunk/bindings/java-jni/jni

[scribe at crosswire.org]

Author: scribe
Date: 2019-05-20 17:57:33 -0700 (Mon, 20 May 2019)
New Revision: 3631

Modified:
   trunk/bindings/java-jni/jni/swordstub.cpp
Log:
java-jni bindings: added lookup of locales at both internal and external storage, preferring external

Modified: trunk/bindings/java-jni/jni/swordstub.cpp
===================================================================
--- trunk/bindings/java-jni/jni/swordstub.cpp	2019-05-20 22:57:18 UTC (rev 3630)
+++ trunk/bindings/java-jni/jni/swordstub.cpp	2019-05-21 00:57:33 UTC (rev 3631)
@@ -251,8 +251,10 @@
 			mgr->augmentModules(SWORD_PATH, true);
 		}
 SWLog::getSystemLog()->logDebug("libsword: init() adding locales from baseDir.");
-		LocaleMgr::getSystemLocaleMgr()->loadConfigDir(SWBuf(baseDir + "/locales.d").c_str());
-		LocaleMgr::getSystemLocaleMgr()->loadConfigDir(SWBuf(baseDir + "/uilocales.d").c_str());
+		LocaleMgr::getSystemLocaleMgr()->loadConfigDir(SWBuf(STORAGE_BASE + "/locales.d").c_str());
+		LocaleMgr::getSystemLocaleMgr()->loadConfigDir(SWBuf(STORAGE_BASE + "/uilocales.d").c_str());
+		LocaleMgr::getSystemLocaleMgr()->loadConfigDir((SWBuf(SWORD_PATH) + "/locales.d").c_str());
+		LocaleMgr::getSystemLocaleMgr()->loadConfigDir((SWBuf(SWORD_PATH) + "/uilocales.d").c_str());
 SWLog::getSystemLog()->logDebug("libsword: init() end.");
 	}
 }