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

Fix GEDCOM export to avoid translated GrampsType strings (#947)

Browse Source 
Fixes #11410

The bug submitter noticed that the GEDCOM export contained translated strings in the MEDI lines of his export. GEDCOM should contain English values for most such cases where 'types' are exported.

I scanned the export code for other potential cases, and found:

* Certain unexpected event types on individuals (Marriage)
* Certain unexpected event types on families (Immigration, Residence, etc.)
* Pedigree types that were not standardized on PEDI,_FREL,_MREL (Sponsored, Unknown)
* Family Attributes other than Number if children (Caste, Description, National etc.)
* Personal Attributes other than Caste, Description, ID, National, number of children, SSN (Occupation etc.)
* The MEDI types of this bug report...
This commit is contained in:
Paul Culley 2019-11-04 19:22:26 -06:00 committed by Sam Manzi
parent 789b72289c
commit 2054c467db
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gramps/plugins/export/exportgedcom.py
View File

@ -596,7 +596,7 @@ class GedcomWriter(UpdateCallback):
if val.strip(): if val.strip():
self._writeln(2, 'TYPE', val) self._writeln(2, 'TYPE', val)
else: else:
self._writeln(2, 'TYPE', str(event.get_type())) self._writeln(2, 'TYPE', event.get_type().xml_str())
self._dump_event_stats(event, event_ref) self._dump_event_stats(event, event_ref)
if etype == EventType.ADOPT and not adop_written: if etype == EventType.ADOPT and not adop_written:
adop_written = True adop_written = True
@ -656,7 +656,7 @@ class GedcomWriter(UpdateCallback):
attr_type = int(attr.get_type()) attr_type = int(attr.get_type())
name = libgedcom.PERSONALCONSTANTATTRIBUTES.get(attr_type) name = libgedcom.PERSONALCONSTANTATTRIBUTES.get(attr_type)
key = str(attr.get_type()) key = attr.get_type().xml_str()
value = attr.get_value().strip().replace('\r', ' ') value = attr.get_value().strip().replace('\r', ' ')
if key in ("AFN", "RFN", "REFN", "_UID", "_FSFTID"): if key in ("AFN", "RFN", "REFN", "_UID", "_FSFTID"):
@ -735,14 +735,14 @@ class GedcomWriter(UpdateCallback):
child.mrel == ChildRefType.FOSTER: child.mrel == ChildRefType.FOSTER:
self._writeln(2, 'PEDI foster') self._writeln(2, 'PEDI foster')
elif child.frel == child.mrel: elif child.frel == child.mrel:
self._writeln(2, 'PEDI %s' % str(child.frel)) self._writeln(2, 'PEDI %s' % child.frel.xml_str())
else: else:
self._writeln(2, '_FREL %s' % self._writeln(
PEDIGREE_TYPES.get(child.frel.value, 2, '_FREL %s' % PEDIGREE_TYPES.get(
str(child.frel))) child.frel.value, child.frel.xml_str()))
self._writeln(2, '_MREL %s' % self._writeln(
PEDIGREE_TYPES.get(child.mrel.value, 2, '_MREL %s' % PEDIGREE_TYPES.get(
str(child.mrel))) child.mrel.value, child.mrel.xml_str()))
def _parent_families(self, person): def _parent_families(self, person):
""" """
@ -910,9 +910,9 @@ class GedcomWriter(UpdateCallback):
self._writeln(1, 'EVEN', descr) self._writeln(1, 'EVEN', descr)
else: else:
self._writeln(1, 'EVEN') self._writeln(1, 'EVEN')
the_type = str(event.get_type()) the_type = event.get_type()
if the_type: if the_type:
self._writeln(2, 'TYPE', the_type) self._writeln(2, 'TYPE', the_type.xml_str())
def _family_event_attrs(self, attr_list, level): def _family_event_attrs(self, attr_list, level):
""" """
@ -946,7 +946,7 @@ class GedcomWriter(UpdateCallback):
attr_type = int(attr.get_type()) attr_type = int(attr.get_type())
name = libgedcom.FAMILYCONSTANTATTRIBUTES.get(attr_type) name = libgedcom.FAMILYCONSTANTATTRIBUTES.get(attr_type)
key = str(attr.get_type()) key = attr.get_type().xml_str()
value = attr.get_value().replace('\r', ' ') value = attr.get_value().replace('\r', ' ')
if key in ("AFN", "RFN", "REFN", "_UID"): if key in ("AFN", "RFN", "REFN", "_UID"):
@ -1097,7 +1097,8 @@ class GedcomWriter(UpdateCallback):
if reporef.get_call_number(): if reporef.get_call_number():
self._writeln(level + 1, 'CALN', reporef.get_call_number()) self._writeln(level + 1, 'CALN', reporef.get_call_number())
if reporef.get_media_type(): if reporef.get_media_type():
self._writeln(level + 2, 'MEDI', str(reporef.get_media_type())) self._writeln(level + 2, 'MEDI',
reporef.get_media_type().xml_str())
def _person_event_ref(self, key, event_ref): def _person_event_ref(self, key, event_ref):
""" """