From 0979947abb8557d7428774f90e7d28d000dd29c9 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 26 Mar 2003 04:32:14 +0000
Subject: [PATCH] Detect intl library successful loading

svn: r1401
---
 src/EditPerson.py     |  1 +
 src/Plugins.py        |  6 +++++-
 src/edit_person.glade |  2 +-
 src/intl.py           | 16 ++++++----------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/EditPerson.py b/src/EditPerson.py
index 7d34c4ba2..d6d411a32 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -326,6 +326,7 @@ class EditPerson:
         self.redraw_addr_list()
         self.redraw_name_list()
         self.redraw_url_list()
+        self.get_widget("notebook").set_current_page(0)
         self.given.grab_focus()
         self.window.show()
 
diff --git a/src/Plugins.py b/src/Plugins.py
index ab01a852d..5372bec73 100644
--- a/src/Plugins.py
+++ b/src/Plugins.py
@@ -57,7 +57,8 @@ import Utils
 import GrampsCfg
 import Errors
 
-from intl import gettext as _
+import intl
+_ = intl.gettext
 
 #-------------------------------------------------------------------------
 #
@@ -278,6 +279,9 @@ class PluginStatus:
 
         info = cStringIO.StringIO()
 
+        if intl.status:
+            _expect.append(('intl:py','GRAMPS was built without internationalization support'))
+
         if len(_expect) + len(_failmsg) == 0:
             window.get_buffer().set_text(_('All modules were successfully loaded.'))
         else:
diff --git a/src/edit_person.glade b/src/edit_person.glade
index cb1f96346..46a4f6569 100644
--- a/src/edit_person.glade
+++ b/src/edit_person.glade
@@ -86,7 +86,7 @@
       </child>
 
       <child>
-	<widget class="GtkNotebook" id="notebook2">
+	<widget class="GtkNotebook" id="notebook">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="show_tabs">True</property>
diff --git a/src/intl.py b/src/intl.py
index 308e2edc4..2fad7fb79 100644
--- a/src/intl.py
+++ b/src/intl.py
@@ -27,16 +27,12 @@ import sys
 ver = sys.version[0:3]
 
 try:
-    if ver == "1.5":
-        from intl15 import *
-    elif ver == "2.0":
-        from intl20 import *
-    elif ver == "2.1":
-        from intl21 import *
-    elif ver == "2.2":
+    if ver == "2.2":
         from intl22 import *
+        status = None
     else:
-        print 'Internationalization library could be loaded'
+        status = 'Internationalization library could not be loaded'
+        print status
         
         def gettext(s):
             return s
@@ -50,8 +46,8 @@ try:
         def bind_textdomain_codeset(s,x):
             return
 except:
-    import traceback
-    traceback.print_exc()
+    status = 'Internationalization library could not be loaded'
+    print status
     
     def gettext(s):
         return s