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.
This commit is contained in:
parent
93e846bf47
commit
ce5a959840
2 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
{
|
||||
|
|
2
wscript
2
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'):
|
||||
|
|
Loading…
Reference in a new issue