Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for 2416: don't save translated name-formats in XML

Browse Source 
svn: r11569
This commit is contained in:
Doug Blank 2009-01-04 20:03:22 +00:00
parent 2ed7f7becb
commit f9be2655d6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/ExportXml.py
View File

@ -5,6 +5,7 @@
# Copyright (C) 2008 Brian G. Matherly # Copyright (C) 2008 Brian G. Matherly
# Copyright (C) 2008 Gary Burton # Copyright (C) 2008 Gary Burton
# Copyright (C) 2008 Robert Cheramy <robert@cheramy.net> # Copyright (C) 2008 Robert Cheramy <robert@cheramy.net>
# Copyright (C) 2009 Douglas S. Blank
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -375,7 +376,7 @@ class GrampsDbXmlWriter(UpdateCallback):
for number, name,fmt_str,active in self.db.name_formats: for number, name,fmt_str,active in self.db.name_formats:
self.g.write('%s<format number="%d" name="%s" ' self.g.write('%s<format number="%d" name="%s" '
'fmt_str="%s" active="%d"/>\n' '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") self.g.write(" </name-formats>\n")
def fix(self,line): def fix(self,line):
@ -1215,4 +1216,4 @@ plugin = ExportPlugin(name = _('GRAMPS _XML database'),
export_function = export_data, export_function = export_data,
extension = "gramps", extension = "gramps",
config = _config ) config = _config )
pmgr.register_plugin(plugin) pmgr.register_plugin(plugin)

5
src/plugins/ImportXml.py
View File

@ -2,6 +2,7 @@
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# Copyright (C) 2009 Douglas S. Blank
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -1060,7 +1061,7 @@ class GrampsParser(UpdateCallback):
if number in self.taken_name_format_numbers: if number in self.taken_name_format_numbers:
number = self.remap_name_format(number) 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): def remap_name_format(self, old_number):
if old_number in self.name_formats_map: # This should not happen if old_number in self.name_formats_map: # This should not happen
@ -2460,4 +2461,4 @@ plugin = ImportPlugin(name = _('GRAMPS XML database'),
'present GRAMPS database format.'), 'present GRAMPS database format.'),
import_function = importData, import_function = importData,
extension = "gramps" ) extension = "gramps" )
pmgr.register_plugin(plugin) pmgr.register_plugin(plugin)