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

Small fixes. Changes in swedish date parser.

Browse Source 
svn: r7832
This commit is contained in:
Stefan Bjork 2006-12-21 13:04:02 +00:00
parent ae213a633b
commit 48e499c88e
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-21 Stefan Bjork <betula@users.sourceforge.net>
* src/plugins/DetAncestralReport.py,
* src/plugins/DetDescendantReport.py: Add dot (".") after event
descriptions.
* src/DateHandler/_Date_sv.py: Use en-dash in time spans.
2006-12-20 Alex Roitman <shura@gramps-project.org> 2006-12-20 Alex Roitman <shura@gramps-project.org>
* src/PluginUtils/_Plugins.py (PluginDialog.__init__): Connect to * src/PluginUtils/_Plugins.py (PluginDialog.__init__): Connect to
signal in the parent class. signal in the parent class.

8
src/DateHandler/_Date_sv.py
View File

@ -60,6 +60,8 @@ class DateParserSv(DateParser):
u'innan' : Date.MOD_BEFORE, u'innan' : Date.MOD_BEFORE,
u'efter' : Date.MOD_AFTER, u'efter' : Date.MOD_AFTER,
u'omkring' : Date.MOD_ABOUT, u'omkring' : Date.MOD_ABOUT,
u'ca' : Date.MOD_ABOUT,
u'c:a' : Date.MOD_ABOUT
} }
bce = ["f Kr"] bce = ["f Kr"]
@ -92,7 +94,7 @@ class DateParserSv(DateParser):
def init_strings(self): def init_strings(self):
DateParser.init_strings(self) DateParser.init_strings(self)
self._span = re.compile(u"(från)\s+(?P<start>.+)\s+till\s+(?P<stop>.+)", self._span = re.compile(u"(från)?\s*(?P<start>.+)\s*(till|--|–)\s*(?P<stop>.+)",
re.IGNORECASE) re.IGNORECASE)
self._range = re.compile(u"(mellan)\s+(?P<start>.+)\s+och\s+(?P<stop>.+)", self._range = re.compile(u"(mellan)\s+(?P<start>.+)\s+och\s+(?P<stop>.+)",
re.IGNORECASE) re.IGNORECASE)
@ -125,7 +127,7 @@ class DateDisplaySv(DateDisplay):
" (islamisk)" " (islamisk)"
) )
_mod_str = ("",u"före ",u"efter ",u"omkring ","","","") _mod_str = ("",u"före ",u"efter ",u"c:a ","","","")
_qual_str = ("",u"uppskattat ",u"beräknat ") _qual_str = ("",u"uppskattat ",u"beräknat ")
@ -149,7 +151,7 @@ class DateDisplaySv(DateDisplay):
elif mod == Date.MOD_SPAN: elif mod == Date.MOD_SPAN:
d1 = self.display_cal[cal](start) d1 = self.display_cal[cal](start)
d2 = self.display_cal[cal](date.get_stop_date()) d2 = self.display_cal[cal](date.get_stop_date())
return u"%sfrån %s till %s%s" % (qual_str,d1,d2,self.calendar[cal]) return u"%s%s – %s%s" % (qual_str,d1,d2,self.calendar[cal])
elif mod == Date.MOD_RANGE: elif mod == Date.MOD_RANGE:
d1 = self.display_cal[cal](start) d1 = self.display_cal[cal](start)
d2 = self.display_cal[cal](date.get_stop_date()) d2 = self.display_cal[cal](date.get_stop_date())

1
src/plugins/DetAncestralReport.py
View File

@ -347,6 +347,7 @@ class DetAncestorReport(Report):
'event_name' : _(evtName)}) 'event_name' : _(evtName)})
if event.get_description(): if event.get_description():
self.doc.write_text(event.get_description()) self.doc.write_text(event.get_description())
self.doc.write_text(".")
self.doc.end_paragraph() self.doc.end_paragraph()
def write_parents(self, person, firstName): def write_parents(self, person, firstName):

1
src/plugins/DetDescendantReport.py
View File

@ -375,6 +375,7 @@ class DetDescendantReport(Report):
'event_name' : _(evtName)}) 'event_name' : _(evtName)})
if event.get_description(): if event.get_description():
self.doc.write_text(event.get_description()) self.doc.write_text(event.get_description())
self.doc.write_text(".")
self.doc.end_paragraph() self.doc.end_paragraph()
def write_parents(self, person, firstName): def write_parents(self, person, firstName):