debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use MIDORI_NLSPATH instead of NLSPATH

Browse source 
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.
This commit is contained in:
Christian Dywan 2009-10-03 02:27:51 +02:00
parent 93e846bf47
commit ce5a959840
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/main.c
View file

@ -1612,8 +1612,8 @@ main (int argc,
#if ENABLE_NLS #if ENABLE_NLS
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
if (g_getenv ("NLSPATH")) if (g_getenv ("MIDORI_NLSPATH"))
bindtextdomain (GETTEXT_PACKAGE, g_getenv ("NLSPATH")); bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH"));
else else
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
{ {

2
wscript
View file

@ -524,7 +524,7 @@ def shutdown ():
pass pass
try: try:
ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions' 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'] lang = os.environ['LANG']
try: try:
for lang in os.listdir (folder + os.sep + 'po'): for lang in os.listdir (folder + os.sep + 'po'):