From 3c722ffb5d2219c2d2c7c6e6e4f39d215822d9f7 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 4 Jan 2009 19:35:05 +0000 Subject: [PATCH] Fix for 2416: don't save translated name-formats in XML svn: r11568 --- src/GrampsDbUtils/_GrampsDbWriteXML.py | 4 ++-- src/GrampsDbUtils/_ReadXML.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GrampsDbUtils/_GrampsDbWriteXML.py b/src/GrampsDbUtils/_GrampsDbWriteXML.py index 226788876..3a06bacc9 100644 --- a/src/GrampsDbUtils/_GrampsDbWriteXML.py +++ b/src/GrampsDbUtils/_GrampsDbWriteXML.py @@ -377,7 +377,7 @@ class GrampsDbXmlWriter(UpdateCallback): for number, name,fmt_str,active in self.db.name_formats: self.g.write('%s\n' - % (' ', number, name,fmt_str,int(active)) ) + % (' ', number, fmt_str, fmt_str, int(active))) self.g.write(" \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 \ No newline at end of file +# Don't export a writer for plugins, that is the task of _WriteXML.py diff --git a/src/GrampsDbUtils/_ReadXML.py b/src/GrampsDbUtils/_ReadXML.py index 3afcd4728..5394ac5f5 100644 --- a/src/GrampsDbUtils/_ReadXML.py +++ b/src/GrampsDbUtils/_ReadXML.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