Spec file update, GEDCOM note work around for FTM bug
svn: r942
This commit is contained in:
parent
41385c0716
commit
279b84e68a
@ -15,7 +15,7 @@ URL: http://gramps.sourceforge.net
|
|||||||
|
|
||||||
Requires: python >= 1.5.2
|
Requires: python >= 1.5.2
|
||||||
Requires: pygnome >= 1.0.53
|
Requires: pygnome >= 1.0.53
|
||||||
Requires: pygnome-libglade
|
Requires: _gladegnomemodule.so
|
||||||
Requires: pyexpat.so
|
Requires: pyexpat.so
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -462,6 +462,10 @@ class Note:
|
|||||||
"""return the note contents"""
|
"""return the note contents"""
|
||||||
return self.text
|
return self.text
|
||||||
|
|
||||||
|
def append(self,text):
|
||||||
|
"""adds the text to the note's contents"""
|
||||||
|
return self.text + text
|
||||||
|
|
||||||
class Photo(SourceNote):
|
class Photo(SourceNote):
|
||||||
"""Containter for information about an image file, including location,
|
"""Containter for information about an image file, including location,
|
||||||
description and privacy"""
|
description and privacy"""
|
||||||
|
@ -13,7 +13,7 @@ if os.environ.has_key("GRAMPSI18N"):
|
|||||||
loc = os.environ["GRAMPSI18N"]
|
loc = os.environ["GRAMPSI18N"]
|
||||||
else:
|
else:
|
||||||
loc = "locale"
|
loc = "locale"
|
||||||
|
|
||||||
intl.textdomain("gramps")
|
intl.textdomain("gramps")
|
||||||
intl.bindtextdomain("gramps",loc)
|
intl.bindtextdomain("gramps",loc)
|
||||||
locale.setlocale(locale.LC_NUMERIC,"C")
|
locale.setlocale(locale.LC_NUMERIC,"C")
|
||||||
|
@ -47,6 +47,9 @@ try:
|
|||||||
def bindtextdomain(s,x):
|
def bindtextdomain(s,x):
|
||||||
return
|
return
|
||||||
except:
|
except:
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
def gettext(s):
|
def gettext(s):
|
||||||
return s
|
return s
|
||||||
|
|
||||||
|
@ -397,9 +397,9 @@ class GedcomParser:
|
|||||||
self.nmap[matches[1]] = noteobj
|
self.nmap[matches[1]] = noteobj
|
||||||
text = matches[2][4:]
|
text = matches[2][4:]
|
||||||
if text == "":
|
if text == "":
|
||||||
noteobj.set(self.parse_note_continue(1))
|
noteobj.append(self.parse_note_continue(1))
|
||||||
else:
|
else:
|
||||||
noteobj.set(text + self.parse_note_continue(1))
|
noteobj.append(text + self.parse_note_continue(1))
|
||||||
self.parse_note_data(1)
|
self.parse_note_data(1)
|
||||||
elif matches[2] == "OBJE":
|
elif matches[2] == "OBJE":
|
||||||
self.ignore_sub_junk(1)
|
self.ignore_sub_junk(1)
|
||||||
|
Loading…
Reference in New Issue
Block a user