switch from intl to gettext

svn: r2017

src/plugins/AncestorChart.py

@@ -48,7 +48,7 @@ import Errors
 import FontScale
 from QuestionDialog import ErrorDialog
 from SubstKeywords import SubstKeywords
-from intl import gettext as _
+from gettext import gettext as _
 
 _BORN = _('b.')
 _DIED = _('d.')

src/plugins/AncestorReport.py

@@ -38,7 +38,7 @@ import TextDoc
 import RelLib
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/Ancestors.py

@@ -35,7 +35,7 @@ import RelLib
 import Errors
 import Relationship
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/BookReport.py

@@ -47,7 +47,7 @@ except:
 # internationalization
 #
 #-------------------------------------------------------------------------
-from intl import gettext as _
+from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -471,7 +471,7 @@ class BookListDisplay:
         self.booklist = booklist
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"book.glade")
-        self.xml = gtk.glade.XML(glade_file,"booklist")
+        self.xml = gtk.glade.XML(glade_file,"booklist","gramps")
         self.top = self.xml.get_widget('booklist')
 
         Utils.set_titles(self.top,
@@ -556,7 +556,7 @@ class BookReportSelector:
         base = os.path.dirname(__file__)
         glade_file = os.path.join(base,"book.glade")
 
-        self.xml = gtk.glade.XML(glade_file,"top")
+        self.xml = gtk.glade.XML(glade_file,"top","gramps")
         self.top = self.xml.get_widget("top")
     
         self.xml.signal_autoconnect({

src/plugins/ChangeTypes.py

@@ -27,7 +27,7 @@ import gtk.glade
 
 import const
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import OkDialog
 import AutoComp
 
@@ -55,7 +55,7 @@ class ChangeTypes:
 
         base = os.path.dirname(__file__)
         glade_file = "%s/%s" % (base,"changetype.glade")
-        self.glade = gtk.glade.XML(glade_file,"top")
+        self.glade = gtk.glade.XML(glade_file,"top","gramps")
 
         self.auto1 = AutoComp.AutoCombo(self.glade.get_widget("original"),
                                         const.personalEvents)

src/plugins/Check.py

@@ -45,7 +45,7 @@ import gtk.glade
 import RelLib
 import Utils
 
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import OkDialog, MissingMediaDialog
 
 #-------------------------------------------------------------------------
@@ -327,7 +327,7 @@ class CheckIntegrity:
 	else:
             base = os.path.dirname(__file__)
             glade_file = base + os.sep + "summary.glade"
-            topDialog = gtk.glade.XML(glade_file,"summary")
+            topDialog = gtk.glade.XML(glade_file,"summary","gramps")
             topDialog.signal_autoconnect({
                 "destroy_passed_object" : Utils.destroy_passed_object,
                 })

src/plugins/CustomBookText.py

@@ -41,7 +41,7 @@ import TextDoc
 import RelLib
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 import gtk
 import gnome

src/plugins/DesGraph.py

@@ -47,7 +47,7 @@ import TextDoc
 import Errors
 
 from SubstKeywords import SubstKeywords
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import ErrorDialog
 
 _BORN = _('b.')

src/plugins/Desbrowser.py

@@ -33,7 +33,7 @@ import os
 #
 #------------------------------------------------------------------------
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 import GrampsCfg
 
 #------------------------------------------------------------------------
@@ -66,7 +66,7 @@ class DesBrowse:
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "desbrowse.glade"
 
-        self.glade = gtk.glade.XML(glade_file,"top")
+        self.glade = gtk.glade.XML(glade_file,"top","gramps")
         self.glade.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
             })

src/plugins/DescendReport.py

@@ -39,7 +39,7 @@ import TextDoc
 import Errors
 
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/DetAncestralReport.py

@@ -26,7 +26,7 @@ import sort
 import Errors
 import string
 
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import ErrorDialog
 
 import Report

src/plugins/DetDescendantReport.py

@@ -27,7 +27,7 @@ import Errors
 import string
 
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 import Report
 import TextDoc

src/plugins/EventCmp.py

@@ -49,7 +49,7 @@ import OpenSpreadSheet
 import const
 
 from QuestionDialog import WarningDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #
@@ -129,7 +129,7 @@ class EventComparison:
         self.glade_file = base + os.sep + "eventcmp.glade"
         self.qual = 0
 
-        self.filterDialog = gtk.glade.XML(self.glade_file,"filters")
+        self.filterDialog = gtk.glade.XML(self.glade_file,"filters","gramps")
         self.filterDialog.signal_autoconnect({
             "on_apply_clicked"       : self.on_apply_clicked,
             "on_editor_clicked"      : self.filter_editor_clicked,
@@ -208,7 +208,7 @@ class DisplayChart:
         base = os.path.dirname(__file__)
         self.glade_file = base + os.sep + "eventcmp.glade"
 
-        self.topDialog = gtk.glade.XML(self.glade_file,"view")
+        self.topDialog = gtk.glade.XML(self.glade_file,"view","gramps")
         self.topDialog.signal_autoconnect({
             "on_write_table"        : self.on_write_table,
             "destroy_passed_object" : Utils.destroy_passed_object
@@ -306,7 +306,7 @@ class DisplayChart:
         return [_("Person"),_("Birth"),_("Death")] + sort_list
 
     def on_write_table(self,obj):
-        self.form = gtk.glade.XML(self.glade_file,"dialog1")
+        self.form = gtk.glade.XML(self.glade_file,"dialog1","gramps")
         self.form.signal_autoconnect({
             "on_save_clicked"       : self.on_save_clicked,
             "on_html_toggled"       : self.on_html_toggled,

src/plugins/FamilyGroup.py

@@ -38,7 +38,7 @@ import Report
 import TextDoc
 import Errors
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import ErrorDialog
 
 #------------------------------------------------------------------------

src/plugins/FanChart.py

@@ -40,7 +40,7 @@ import Calendar
 from QuestionDialog import ErrorDialog
 from FontScale import string_width
 from SubstKeywords import SubstKeywords
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/FilterEditor.py

@@ -49,7 +49,7 @@ import AutoComp
 import ListModel
 import Utils
 import SelectPerson
-from intl import gettext as _
+from gettext import gettext as _
 
 _name2list = {
     _('Personal event:')     : const.personalEvents,
@@ -217,7 +217,7 @@ class FilterEditor:
         self.filterdb = GenericFilter.GenericFilterList(filterdb)
         self.filterdb.load()
 
-        self.editor = gtk.glade.XML(const.filterFile,'filter_list')
+        self.editor = gtk.glade.XML(const.filterFile,'filter_list',"gramps")
         self.editor_top = self.editor.get_widget('filter_list')
         self.filter_list = self.editor.get_widget('filters')
         self.edit = self.editor.get_widget('edit')
@@ -289,7 +289,7 @@ class FilterEditor:
 
     def filter_editor(self,filter):
         self.filter = filter
-        self.glade = gtk.glade.XML(const.filterFile,'define_filter')
+        self.glade = gtk.glade.XML(const.filterFile,'define_filter',"gramps")
         self.top = self.glade.get_widget('define_filter')
         self.define_title = self.glade.get_widget('title')
 
@@ -392,7 +392,7 @@ class FilterEditor:
             self.pmap[p.get_title()] = p
 
         self.active_rule = val
-        self.rule = gtk.glade.XML(const.filterFile,'rule_editor')
+        self.rule = gtk.glade.XML(const.filterFile,'rule_editor',"gramps")
         self.rule_top = self.rule.get_widget('rule_editor')
         self.valuebox = self.rule.get_widget('valuebox')
         self.rname = self.rule.get_widget('ruletree')
@@ -568,7 +568,7 @@ class FilterEditor:
 
 class ShowResults:
     def __init__(self,plist):
-        self.glade = gtk.glade.XML(const.filterFile,'test')
+        self.glade = gtk.glade.XML(const.filterFile,'test',"gramps")
         self.top = self.glade.get_widget('test')
         text = self.glade.get_widget('text')
 

src/plugins/FtmStyleAncestors.py

@@ -37,7 +37,7 @@ import TextDoc
 import RelLib
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/FtmStyleDescendants.py

@@ -43,7 +43,7 @@ import RelLib
 import Errors
 import Utils
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/GraphViz.py

@@ -46,7 +46,7 @@ import TextDoc
 import GenericFilter
 import Errors
 
-from intl import gettext as _
+from gettext import gettext as _
 from latin_utf8 import utf8_to_latin
 
 #------------------------------------------------------------------------

src/plugins/IndivComplete.py

@@ -39,7 +39,7 @@ import Report
 import GenericFilter
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/IndivSummary.py

@@ -46,7 +46,7 @@ import StyleEditor
 import Report
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/Makefile.in

@@ -75,7 +75,6 @@ GNOMELIB = @GNOMELIB@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@

src/plugins/Merge.py

@@ -31,7 +31,7 @@ import soundex
 import GrampsCfg
 import ListModel
 import MergeData
-from intl import gettext as _ 
+from gettext import gettext as _ 
 
 #-------------------------------------------------------------------------
 #
@@ -101,7 +101,7 @@ class Merge:
 
         base = os.path.dirname(__file__)
         self.glade_file = "%s/%s" % (base,"merge.glade")
-        top = gtk.glade.XML(self.glade_file,"dialog")
+        top = gtk.glade.XML(self.glade_file,"dialog","gramps")
         
         my_menu = gtk.Menu()
         item = gtk.MenuItem(_("Low"))
@@ -142,7 +142,7 @@ class Merge:
             gtk.mainiteration()
 
     def find_potentials(self,thresh):
-        top = gtk.glade.XML(self.glade_file,"message")
+        top = gtk.glade.XML(self.glade_file,"message","gramps")
         self.topWin = top.get_widget("message")
         self.progress = top.get_widget("progressbar1")
 
@@ -208,7 +208,7 @@ class Merge:
         self.dellist = {}
 
     def show(self):
-        top = gtk.glade.XML(self.glade_file,"mergelist")
+        top = gtk.glade.XML(self.glade_file,"mergelist","gramps")
         self.window = top.get_widget("mergelist")
 
         Utils.set_titles(self.window, top.get_widget('title'),

src/plugins/PatchNames.py

@@ -44,7 +44,7 @@ import gtk.glade
 #-------------------------------------------------------------------------
 import Utils
 from QuestionDialog import OkDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -114,7 +114,7 @@ class PatchNames:
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "patchnames.glade"
         
-        self.top = gtk.glade.XML(glade_file,"top")
+        self.top = gtk.glade.XML(glade_file,"top","gramps")
         self.top.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
             "on_ok_clicked" : self.on_ok_clicked

src/plugins/ReadGedcom.py

@@ -55,7 +55,7 @@ import latin_utf8
 import Utils
 from GedcomInfo import *
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -128,7 +128,7 @@ def importData(database, filename, cb=None):
 
     glade_file = "%s/gedcomimport.glade" % os.path.dirname(__file__)
 
-    statusTop = gtk.glade.XML(glade_file,"status")
+    statusTop = gtk.glade.XML(glade_file,"status","gramps")
     statusWindow = statusTop.get_widget("status")
 
     Utils.set_titles(statusWindow,statusTop.get_widget('title'),

src/plugins/ReadNative.py

@@ -26,7 +26,7 @@
 
 from ReadXML import *
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 import gtk
 import const
 import os

src/plugins/ReadPkg.py

@@ -26,7 +26,7 @@
 
 from ReadXML import *
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 import gtk
 import const
 import os

src/plugins/RelCalc.py

@@ -46,7 +46,7 @@ import RelLib
 import Utils
 import ListModel
 import Plugins
-from intl import gettext as _
+from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -73,7 +73,7 @@ class RelCalc:
 
         base = os.path.dirname(__file__)
         glade_file = "%s/relcalc.glade" % base
-        self.glade = gtk.glade.XML(glade_file,"relcalc")
+        self.glade = gtk.glade.XML(glade_file,"relcalc","gramps")
 
         name = self.person.getPrimaryName().getRegularName()
 

src/plugins/ReorderIds.py

@@ -25,7 +25,7 @@ scheme specified in the database's prefix ids
 
 import re
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 
 _findint = re.compile('^[^\d]*(\d+)[^\d]*')
 

src/plugins/SimpleBookTitle.py

@@ -36,7 +36,7 @@ import TextDoc
 import RelLib
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 import gtk
 import gnome

src/plugins/Summary.py

@@ -35,7 +35,7 @@ import posixpath
 #------------------------------------------------------------------------
 import Utils
 import RelLib
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #
@@ -134,7 +134,7 @@ def report(database,person):
     base = os.path.dirname(__file__)
     glade_file = "%s/summary.glade" % base
 
-    topDialog = gtk.glade.XML(glade_file,"summary")
+    topDialog = gtk.glade.XML(glade_file,"summary","gramps")
     topDialog.signal_autoconnect({
         "destroy_passed_object" : Utils.destroy_passed_object,
     })

src/plugins/TimeLine.py

@@ -52,7 +52,7 @@ import FontScale
 import sort
 from QuestionDialog import ErrorDialog
 
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/Verify.py

@@ -49,7 +49,7 @@ import gtk.glade
 #------------------------------------------------------------------------
 import RelLib
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 
 db = None
 glade_file = None
@@ -74,7 +74,7 @@ def runTool(database,active_person,callback):
     base = os.path.dirname(__file__)
     glade_file = base + os.sep + "verify.glade"
 
-    verifySettings = gtk.glade.XML(glade_file,"verify_settings")
+    verifySettings = gtk.glade.XML(glade_file,"verify_settings","gramps")
     verifySettings.signal_autoconnect({
         "destroy_passed_object" : Utils.destroy_passed_object,
         "on_verify_ok_clicked" : on_apply_clicked
@@ -391,7 +391,7 @@ def on_apply_clicked(obj):
     error.close()
     warn.close()
     
-    verifyResult = gtk.glade.XML(glade_file,"verify_result")
+    verifyResult = gtk.glade.XML(glade_file,"verify_result","gramps")
     Utils.set_titles(verifyResult.get_widget('verify_result'),
                      verifyResult.get_widget('title'),
                      _('Database Verify'))

src/plugins/WebPage.py

@@ -54,7 +54,7 @@ import sort
 import Report
 import Errors
 from QuestionDialog import ErrorDialog
-from intl import gettext as _
+from gettext import gettext as _
 
 #------------------------------------------------------------------------
 #

src/plugins/WriteCD.py

@@ -50,7 +50,7 @@ import QuestionDialog
 import RelImage
 import ImgManip
 
-from intl import gettext as _
+from gettext import gettext as _
 
 _title_string = _("Export to CD")
 
@@ -89,7 +89,7 @@ class PackageWriter:
                 "on_ok_clicked" : self.on_ok_clicked
                 }
         
-            self.top = gtk.glade.XML(glade_file,"packageExport")
+            self.top = gtk.glade.XML(glade_file,"packageExport","gramps")
 
             Utils.set_titles(self.top.get_widget('packageExport'),
                          self.top.get_widget('title'),_title_string)

src/plugins/WriteFtree.py

@@ -50,7 +50,7 @@ import Errors
 
 from QuestionDialog import MissingMediaDialog
 
-from intl import gettext as _
+from gettext import gettext as _
 
 _title_string = _("Export to Web Family Tree")
 
@@ -86,7 +86,7 @@ class FtreeWriter:
             }
 
         self.plist = {}
-        self.top = gtk.glade.XML(glade_file,"top")
+        self.top = gtk.glade.XML(glade_file,"top","gramps")
 
         Utils.set_titles(self.top.get_widget('top'),
                          self.top.get_widget('title'),

src/plugins/WriteGedcom.py

@@ -56,7 +56,7 @@ import GedcomInfo
 import Errors
 import ansel_utf8
 
-from intl import gettext as _
+from gettext import gettext as _
 from QuestionDialog import ErrorDialog
 
 _title_string = _("Export to GEDCOM")
@@ -364,7 +364,7 @@ class GedcomWriter:
         else:
             glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__)
             
-            self.topDialog = gtk.glade.XML(glade_file,"gedcomExport")
+            self.topDialog = gtk.glade.XML(glade_file,"gedcomExport","gramps")
             self.topDialog.signal_autoconnect({
                 "destroy_passed_object" : Utils.destroy_passed_object,
                 "gnu_free" : self.gnu_free,
@@ -499,7 +499,7 @@ class GedcomWriter:
 
         glade_file = "%s/gedcomexport.glade" % os.path.dirname(__file__)
 
-        self.exprogress = gtk.glade.XML(glade_file,"exportprogress")
+        self.exprogress = gtk.glade.XML(glade_file,"exportprogress","gramps")
         self.exprogress.signal_autoconnect({
             "on_close_clicked" : Utils.destroy_passed_object
             })

src/plugins/WritePkg.py

@@ -47,7 +47,7 @@ import TarFile
 import Utils
 from QuestionDialog import MissingMediaDialog
 
-from intl import gettext as _
+from gettext import gettext as _
 
 _title_string = _("Export to GRAMPS package")
 #-------------------------------------------------------------------------
@@ -81,7 +81,7 @@ class PackageWriter:
             "on_ok_clicked" : self.on_ok_clicked
             }
         
-        self.top = gtk.glade.XML(glade_file,"packageExport")
+        self.top = gtk.glade.XML(glade_file,"packageExport","gramps")
 
         Utils.set_titles(self.top.get_widget('packageExport'),
                          self.top.get_widget('title'),

src/plugins/count_anc.py

@@ -22,7 +22,7 @@
 
 import os
 import Utils
-from intl import gettext as _
+from gettext import gettext as _
 
 from gnome.ui import *
 import gtk
@@ -41,7 +41,7 @@ class CountAncestors:
         
         text = ""
         glade_file = "%s/summary.glade" % os.path.dirname(__file__)
-        topDialog = gtk.glade.XML(glade_file,"summary")
+        topDialog = gtk.glade.XML(glade_file,"summary","gramps")
         topDialog.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
             })

src/plugins/eval.py

@@ -30,13 +30,13 @@ import gtk.glade
 
 import Utils
 
-from intl import gettext as _
+from gettext import gettext as _
 
 class EvalWindow:
 
     def __init__(self):
         glade_file = "%s/%s" % (os.path.dirname(__file__),"eval.glade")
-        self.glade = gtk.glade.XML(glade_file,"top")
+        self.glade = gtk.glade.XML(glade_file,"top","gramps")
 
         self.top = self.glade.get_widget("top")
         self.dbuf = self.glade.get_widget("display").get_buffer()

src/plugins/leak.py

@@ -27,13 +27,13 @@ import gtk.glade
 import gc
 import string
 
-from intl import gettext as _
+from gettext import gettext as _
 
 class EvalWindow:
 
     def __init__(self):
         glade_file = "%s/%s" % (os.path.dirname(__file__),"leak.glade")
-        self.glade = gtk.glade.XML(glade_file,"top")
+        self.glade = gtk.glade.XML(glade_file,"top","gramps")
 
         self.top = self.glade.get_widget("top")
         self.eval = self.glade.get_widget("eval")

src/plugins/soundgen.py

@@ -29,7 +29,7 @@ import soundex
 import Utils
 import AutoComp
 
-from intl import gettext as _
+from gettext import gettext as _
 
 #-------------------------------------------------------------------------
 #
@@ -46,7 +46,7 @@ class SoundGen:
         base = os.path.dirname(__file__)
         glade_file = base + os.sep + "soundex.glade"
 
-        self.glade = gtk.glade.XML(glade_file,"soundEx")
+        self.glade = gtk.glade.XML(glade_file,"soundEx","gramps")
         self.glade.signal_autoconnect({
             "destroy_passed_object" : Utils.destroy_passed_object,
         })