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

* src/plugins/NavWebPage.py (display_note_object,

Browse Source 
ContactPage.__init__, display_spouse): Do not treat linebreaks in
the preformatted notes; (IndividualPage.__init__): restrict notes,
url list, and source on living people.


svn: r5493
This commit is contained in:
Alex Roitman 2005-12-07 05:09:24 +00:00
parent b258b2ca85
commit 74133275e9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,6 +1,10 @@
2005-12-06 Alex Roitman <shura@gramps-project.org> 2005-12-06 Alex Roitman <shura@gramps-project.org>
* src/gramps.glade (date_edit): Allow negative year integers. * src/gramps.glade (date_edit): Allow negative year integers.
* src/po/nl.po: Correct %s mismatches. * src/po/nl.po: Correct %s mismatches.
* src/plugins/NavWebPage.py (display_note_object,
ContactPage.__init__, display_spouse): Do not treat linebreaks in
the preformatted notes; (IndividualPage.__init__): restrict notes,
url list, and source on living people.
2005-12-06 Jérôme Rapinat <romjerome@yahoo.fr> 2005-12-06 Jérôme Rapinat <romjerome@yahoo.fr>
* src/po/fr.po: Partial translation update. * src/po/fr.po: Partial translation update.

15
gramps2/src/plugins/NavWebPage.py
View File

@ -399,7 +399,7 @@ class BasePage:
of.write('<div id="narrative">\n') of.write('<div id="narrative">\n')
of.write('<h4>%s</h4>\n' % _('Narrative')) of.write('<h4>%s</h4>\n' % _('Narrative'))
if format: if format:
text = u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>" text = u"<pre>%s</pre>" % text
else: else:
text = u"</p><p>".join(text.split("\n")) text = u"</p><p>".join(text.split("\n"))
of.write('<p>%s</p>\n' % text) of.write('<p>%s</p>\n' % text)
@ -1308,7 +1308,7 @@ class ContactPage(BasePage):
text = nobj.get() text = nobj.get()
if format: if format:
text = u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>" text = u"<pre>%s</pre>" % text
else: else:
text = u"</p><p>".join(text.split("\n")) text = u"</p><p>".join(text.split("\n"))
of.write('<p>%s</p>\n' % text) of.write('<p>%s</p>\n' % text)
@ -1371,9 +1371,9 @@ class IndividualPage(BasePage):
self.display_additional_images_as_gallery(of, db, media_list) self.display_additional_images_as_gallery(of, db, media_list)
self.display_note_object(of, self.person.get_note_object()) self.display_note_object(of, self.person.get_note_object())
self.display_url_list(of, self.person.get_url_list()) self.display_url_list(of, self.person.get_url_list())
self.display_ind_sources(of) self.display_ind_sources(of)
self.display_ind_pedigree(of) self.display_ind_pedigree(of)
if self.usegraph: if self.usegraph:
self.display_tree(of) self.display_tree(of)
@ -1877,8 +1877,9 @@ class IndividualPage(BasePage):
format = nobj.get_format() format = nobj.get_format()
text = nobj.get() text = nobj.get()
if format: if format:
of.write( u"<pre>" + u"<br />".join(text.split("\n"))+u"</pre>") of.write( u"<pre>%s</pre>" % text
else: of.write( u"</p><p>".join(text.split("\n"))) else:
of.write( u"</p><p>".join(text.split("\n")))
of.write('</td>\n</tr>\n') of.write('</td>\n</tr>\n')
def pedigree_person(self,of,person,is_spouse=False): def pedigree_person(self,of,person,is_spouse=False):