* various: merge changes made in gramps20 up until R2_0_9 tag.

svn: r5544

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('<metadata>\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')

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('<?xml version="1.0" encoding="UTF-8"?>\n')
         self.cntnt.write('<office:document-content ')
@@ -998,7 +994,6 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
 #--------------------------------------------------------------------------
 print_label = None
 try:
-    import Utils
     
     mprog = GrampsMime.get_application(_apptype)
     mtype = GrampsMime.get_description(_apptype)