From 8c331a5d92eaf611a9b4792602684025d68ec211 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 3 Sep 2013 17:39:04 +0000
Subject: [PATCH] Bug 7036: [Win32]Setting LANG crashes Gramps

Also fixes Bug 6919: No automatic language selection in Windows
Thanks to Helge Herz.

svn: r23011
---
 gramps/gen/utils/grampslocale.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gramps/gen/utils/grampslocale.py b/gramps/gen/utils/grampslocale.py
index b9db33bca..878ecd2fc 100644
--- a/gramps/gen/utils/grampslocale.py
+++ b/gramps/gen/utils/grampslocale.py
@@ -105,11 +105,11 @@ _LOCALE_NAMES = {
 def _check_mswin_locale(locale):
     msloc = None
     try:
-        msloc = _LOCALE_NAMES[locale[:5]]
+        msloc = _LOCALE_NAMES[locale[:5]][:2]
         locale = locale[:5]
     except KeyError:
         try:
-            msloc = _LOCALE_NAMES[locale[:2]]
+            msloc = _LOCALE_NAMES[locale[:2]][:2]
             locale = locale[:2]
         except KeyError:
             return (None, None)
@@ -196,7 +196,7 @@ class GrampsLocale(object):
             locale.setlocale(locale.LC_ALL, '')
             (lang, encoding) = locale.getlocale()
             loc = _check_mswin_locale_reverse(lang)
-            if loc:
+            if loc[0]:
                 self.lang = loc[0]
                 self.encoding = loc[1]
             else: