Use MIDORI_NLSPATH instead of NLSPATH

A small number of systems uses NLSPATH in a way that breaks
localization in Midori. It is unclear what the correct way is to
use NLSPATH, so we switch to using a prefixed variable.

diff --git a/midori/main.c b/midori/main.c
index dfe9489f0342a3a59d642dc94427e269a8e07266..60b6ad27da0f6e4d6e2a13cd986f9b7884d90eb9 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -1612,8 +1612,8 @@ main (int    argc,
 
     #if ENABLE_NLS
     setlocale (LC_ALL, "");
-    if (g_getenv ("NLSPATH"))
-        bindtextdomain (GETTEXT_PACKAGE, g_getenv ("NLSPATH"));
+    if (g_getenv ("MIDORI_NLSPATH"))
+        bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH"));
     else
     #ifdef G_OS_WIN32
     {

diff --git a/wscript b/wscript
index 8c0df7409ea086a59485a4b2b10b19a21034ca03..001918248b74a7388e21f9b7819439a780aa84e2 100644 (file)
--- a/wscript
+++ b/wscript
@@ -524,7 +524,7 @@ def shutdown ():
             pass
         try:
             ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions'
-            nls = 'NLSPATH=' + relfolder + os.sep + 'po'
+            nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
             lang = os.environ['LANG']
             try:
                 for lang in os.listdir (folder + os.sep + 'po'):