From ce5a959840fe78c97327a4ff5dd34eefc3a97406 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 3 Oct 2009 02:27:51 +0200 Subject: [PATCH] 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. --- midori/main.c | 4 ++-- wscript | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/midori/main.c b/midori/main.c index dfe9489f..60b6ad27 100644 --- 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 8c0df740..00191824 100644 --- 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'):