* src/WriteGedcom.py: Fix family source references, fix spurious

PLAC subrecords, respect more privacy settings
* src/po/es.po: Translation fixes


svn: r4865

gramps2/ChangeLog

@@ -1,3 +1,8 @@
+2005-06-23  Julio Sanchez  <jsanchez@users.sourceforge.net>
+	* src/WriteGedcom.py: Fix family source references, fix spurious
+	PLAC subrecords, respect more privacy settings
+	* src/po/es.po: Translation fixes
+
 2005-06-22  Don Allingham  <don@gramps-project.org>
 	* src/FamilyView.py: fix deleting of spouse and children
 	* src/PlaceView.py: fix sorting

gramps2/src/WriteGedcom.py

@@ -120,8 +120,8 @@ def add_familys_sources(db,family_handle,slist,private):
             continue
         for source_ref in attr.get_source_references():
             sbase = source_ref.get_base_handle()
-            if sbase != None and not slist.has_key(sbase.get_handle()):
+            if sbase != None and not slist.has_key(sbase):
-                slist[sbase.get_handle()] = 1
+                slist[sbase] = 1
 
 #-------------------------------------------------------------------------
 #
@@ -907,12 +907,19 @@ class GedcomWriter:
                     val = const.personalConstantAttributes[name]
                 else:
                     val = ""
-                if val : 
+                value = self.cnvtxt(attr.get_value()).replace('\r',' ')
-                    self.writeln("1 %s" % val)
+                if val:
+                    if value:
+                        self.writeln("1 %s %s" % (val, value))
+                    else:
+                        self.writeln("1 %s" % val)
                 else:
                     self.writeln("1 EVEN")
-                    self.writeln("2 TYPE %s" % self.cnvtxt(name))
+                    if value:
-                self.writeln("2 PLAC %s" % self.cnvtxt(attr.get_value()).replace('\r',' '))
+                        self.writeln("2 TYPE %s %s" % (self.cnvtxt(name), value
+))
+                    else:
+                        self.writeln("2 TYPE %s" % self.cnvtxt(name))
                 if attr.get_note():
                     self.write_long_text("NOTE",2,self.cnvtxt(attr.get_note()))
                 for srcref in attr.get_source_references():
@@ -955,6 +962,8 @@ class GedcomWriter:
                 photos = []
 
             for photo in photos:
+                if self.private and photo.get_privacy():
+                    continue
                 photo_obj_id = photo.get_reference_handle()
                 photo_obj = self.db.get_object_from_handle(photo_obj_id)
                 if photo_obj and photo_obj.get_mime_type() == "image/jpeg":
@@ -997,6 +1006,8 @@ class GedcomWriter:
         if not restricted:
             if self.obje:
                 for url in person.get_url_list():
+                    if self.private and url.get_privacy():
+                        continue
                     self.writeln('1 OBJE')
                     self.writeln('2 FORM URL')
                     if url.get_description():

gramps2/src/po/es.po

@@ -4,9 +4,14 @@
 # #
 # #	$Id$
 # #	$Log$
+# #	Revision 1.5.2.6  2005/06/23 16:27:47  jsanchez
+# #	* src/WriteGedcom.py: Fix family source references, fix spurious
+# #	PLAC subrecords, respect more privacy settings
+# #	* src/po/es.po: Translation fixes
+# #
 # #	Revision 1.5.2.5  2005/06/03 21:07:17  jsanchez
 # #	* src/po/es.po: Translation update for version 2.0.2.
-# #
+# #	
 # #	Revision 1.5.2.3  2005/05/10 13:52:41  jsanchez
 # #	* src/po/es.po: Updated translation
 # #	* src/plugins/rel_es.py: Revert to more conservative relationships
@@ -74,7 +79,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GRAMPS 0.9.0\n"
 "POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-03 20:07+0200\n"
+"PO-Revision-Date: 2005-06-21 14:40+0200\n"
 "Last-Translator: Julio Sánchez <julio.sanchez@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -345,7 +350,7 @@ msgstr "Nombre de la Columna"
 
 #: Date.py:105
 msgid "Gregorian"
-msgstr "Gragoriano"
+msgstr "Gregoriano"
 
 #: Date.py:106
 msgid "Julian"
@@ -944,7 +949,7 @@ msgstr "f."
 
 #: FamilyView.py:72
 msgid "#"
-msgstr "#"
+msgstr "Nº"
 
 #: FamilyView.py:75 MergePeople.py:108 PeopleView.py:60
 #: plugins/IndivComplete.py:418 plugins/IndivSummary.py:240
@@ -1216,7 +1221,7 @@ msgid ""
 "the relationship path between two persons."
 msgstr ""
 "Compara los ascendientes de dos personas hasta encontrar un ascendiente "
-"común, produciendo un camino de parentesto entre dos personas."
+"común, produciendo un camino de parentesco entre dos personas."
 
 #: GenericFilter.py:261
 msgid "People with <Id>"
@@ -1749,7 +1754,7 @@ msgstr "ID de la fuente:"
 
 #: GenericFilter.py:1809
 msgid "People with the <source>"
-msgstr "Personas que tienen la <fuente;"
+msgstr "Personas que tienen la <fuente>"
 
 #: GenericFilter.py:1811
 msgid "Matches people who have a particular source"
@@ -5686,7 +5691,7 @@ msgid ""
 "Select an existing media object from the database and place it in this "
 "gallery"
 msgstr ""
-"Seleccionar un objeto audiovisual de la bsee de datos y colocarla en esta "
+"Seleccionar un objeto audiovisual de la base de datos y colocarla en esta "
 "galería"
 
 #: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
@@ -7396,11 +7401,11 @@ msgstr " f. %(death_date)s"
 
 #: plugins/Ancestors.py:547
 msgid "born"
-msgstr "nacido"
+msgstr "nació"
 
 #: plugins/Ancestors.py:559
 msgid "died"
-msgstr "fallecido"
+msgstr "falleció"
 
 #: plugins/Ancestors.py:605
 msgid "Mrs."
@@ -7708,7 +7713,7 @@ msgstr "Se encontr
 
 #: plugins/Check.py:500
 msgid "%d empty families were found\n"
-msgstr "se econtraron %d familias vacías\n"
+msgstr "se encontraron %d familias vacías\n"
 
 #: plugins/Check.py:502
 msgid "1 corrupted family relationship fixed\n"