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

3756: Cannot set new year value different than default (first January)

Browse Source 
svn: r15074
This commit is contained in:
Jérôme Rapinat
2010-04-10 18:27:43 +00:00
parent d8f2a046b4
commit 6b3c125866
16 changed files with 189 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/DateHandler/_Date_nl.py
View File

@@ -150,9 +150,9 @@ class DateDisplayNL(DateDisplay):
u"jul", u"aug", u"sep", u"okt", u"nov", u"dec" )
calendar = (
"", u" (juliaans)", u" (hebreeuws)",
u" (franse republiek)", u" (persisch)", u" (islamitisch)",
u" (zweeds)" )
"", u"juliaans", u"hebreeuws",
u"franse republiek", u"persisch", u"islamitisch",
u"zweeds" )
_mod_str = ("", u"voor ", u"na ", u"rond ", "", "", "")
@@ -234,6 +234,7 @@ class DateDisplayNL(DateDisplay):
cal = date.get_calendar()
qual = date.get_quality()
start = date.get_start_date()
newyear = date.get_new_year()
qual_str = self._qual_str[qual]
@@ -244,17 +245,20 @@ class DateDisplayNL(DateDisplay):
elif mod == Date.MOD_SPAN:
d1 = self.display_cal[cal](start)
d2 = self.display_cal[cal](date.get_stop_date())
scal = self.format_extras(cal, newyear)
return "%s%s %s %s %s%s" % (qual_str, u'van', d1,
u'tot', d2, self.calendar[cal])
u'tot', d2, scal)
elif mod == Date.MOD_RANGE:
d1 = self.display_cal[cal](start)
d2 = self.display_cal[cal](date.get_stop_date())
scal = self.format_extras(cal, newyear)
return "%stussen %s en %s%s" % (qual_str, d1, d2,
self.calendar[cal])
scal)
else:
text = self.display_cal[date.get_calendar()](start)
scal = self.format_extras(cal, newyear)
return "%s%s%s%s" % (qual_str, self._mod_str[mod], text,
self.calendar[cal])
scal)
#-------------------------------------------------------------------------
#