diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index b68f58e2a..2c4cd0b3f 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2005-12-08 Don Allingham + * src/Utils.py: add xml:lang generation function + * src/docgen/AbiWord2Doc.py: set locale + * src/docgen/OpenOfficeDoc: set locale using xml_lang() + * src/plugins/NavWebPage.py: set locale + 2005-12-08 Alex Roitman * src/Utils.py (probably_alive): return False if any event of the person happened over 150 years ago; (too_old): add diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index a68a1ddfc..7ca64866a 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -77,6 +77,15 @@ def fix_encoding(value): else: return value +import locale + +def xml_lang(): + (loc,enc) = locale.getlocale() + if loc == None: + return "" + else: + return loc.replace('_','-') + #------------------------------------------------------------------------- # # force_unicode diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index 6bc8b8276..89b44ad76 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -37,6 +37,7 @@ import Errors import PluginMgr import ImgManip import GrampsMime +import Utils from gettext import gettext as _ @@ -85,7 +86,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): self.f.write('fileformat="1.1" xmlns:math="http://www.w3.org/1998/Math/MathML" ') self.f.write('xmlns:awml="http://www.abisource.com/awml.dtd" xmlns="http://www.abisource.com/awml.dtd" ') self.f.write('xmlns:xlink="http://www.w3.org/1999/xlink" version="1.9.1" xml:space="preserve" ') - self.f.write('props="lang:en-US; dom-dir:ltr">\n') + self.f.write('props="lang:%s; dom-dir:ltr">\n' % Utils.xml_lang()) # metadata section self.f.write('\n') @@ -324,8 +325,6 @@ class AbiWordDoc(BaseDoc.BaseDoc): # #-------------------------------------------------------------------------- -import Utils - try: prog = GrampsMime.get_application("application/x-abiword") mtype = GrampsMime.get_description('application/x-abiword') diff --git a/gramps2/src/docgen/OpenOfficeDoc.py b/gramps2/src/docgen/OpenOfficeDoc.py index d7202174c..ff3e6998d 100644 --- a/gramps2/src/docgen/OpenOfficeDoc.py +++ b/gramps2/src/docgen/OpenOfficeDoc.py @@ -44,6 +44,7 @@ import PluginMgr import ImgManip import FontScale import GrampsMime +import Utils from ReportUtils import pt2cm #------------------------------------------------------------------------- @@ -103,12 +104,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc): assert(self.init_called==False) self.init_called = True - current_locale = locale.getlocale() - self.lang = current_locale[0] - if self.lang: - self.lang = self.lang.replace('_','-') - else: - self.lang = "en-US" + self.lang = Utils.xml_lang() self.cntnt.write('\n') self.cntnt.write('\n') of.write('\n\n') + xmllang = Utils.xml_lang() + of.write('xml:lang="%s" lang="%s">\n\n' % (xmllang,xmllang)) of.write('%s - %s\n' % (self.title_str, title)) of.write('\n' % self.encoding)