Fix for 2416: don't save translated name-formats in XML
svn: r11568
This commit is contained in:
parent
a518a48140
commit
3c722ffb5d
@ -377,7 +377,7 @@ class GrampsDbXmlWriter(UpdateCallback):
|
||||
for number, name,fmt_str,active in self.db.name_formats:
|
||||
self.g.write('%s<format number="%d" name="%s" '
|
||||
'fmt_str="%s" active="%d"/>\n'
|
||||
% (' ', number, name,fmt_str,int(active)) )
|
||||
% (' ', number, fmt_str, fmt_str, int(active)))
|
||||
self.g.write(" </name-formats>\n")
|
||||
|
||||
def fix(self,line):
|
||||
@ -1113,4 +1113,4 @@ def conf_priv(obj):
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
# Don't export a writer for plugins, that is the task of _WriteXML.py
|
||||
# Don't export a writer for plugins, that is the task of _WriteXML.py
|
||||
|
@ -1054,7 +1054,7 @@ class GrampsParser(UpdateCallback):
|
||||
if number in self.taken_name_format_numbers:
|
||||
number = self.remap_name_format(number)
|
||||
|
||||
self.name_formats.append((number, name, fmt_str, active))
|
||||
self.name_formats.append((number, fmt_str, fmt_str, active))
|
||||
|
||||
def remap_name_format(self, old_number):
|
||||
if self.name_formats_map.has_key(old_number): # This should not happen
|
||||
|
Loading…
Reference in New Issue
Block a user