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

* src/DateDisplay.py: handle BCE better

Browse Source 
svn: r5179
This commit is contained in:
Don Allingham
2005-09-05 00:06:17 +00:00
parent 1bf7432260
commit 7c11d689e0
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/ChangeLog
View File

@ -1,4 +1,5 @@
2005-09-04 Don Allingham <don@gramps-project.org> 2005-09-04 Don Allingham <don@gramps-project.org>
* src/DateDisplay.py: handle BCE better
* src/ReadXML.py: read the patronymic portion of a name properly. * src/ReadXML.py: read the patronymic portion of a name properly.
2005-09-04 Eero Tamminen <eerot@sf> 2005-09-04 Eero Tamminen <eerot@sf>

33
gramps2/src/DateDisplay.py
View File

@ -186,17 +186,13 @@ class DateDisplay:
def _slash_year(self,val,slash): def _slash_year(self,val,slash):
if val < 0: if val < 0:
val = - val val = - val
# self._bce_str is a localizes string that prints B.C.E. at the apropriate place
format_string = self._bce_str
else:
format_string = "%s"
if slash: if slash:
year = "%d/%d" % (val,(val%10)+1) year = "%d/%d" % (val,(val%10)+1)
else: else:
year = "%d" % (val) year = "%d" % (val)
return format_string % year return year
def display_iso(self,date_val): def display_iso(self,date_val):
# YYYY-MM-DD (ISO) # YYYY-MM-DD (ISO)
@ -208,7 +204,10 @@ class DateDisplay:
value = "%s-%02d" % (year,date_val[1]) value = "%s-%02d" % (year,date_val[1])
else: else:
value = "%s-%02d-%02d" % (year,date_val[1],date_val[0]) value = "%s-%02d-%02d" % (year,date_val[1],date_val[0])
return value if date_val[2] < 0:
return self._bce_str % value
else:
return value
def text_display(self,date): def text_display(self,date):
""" """
@ -221,14 +220,14 @@ class DateDisplay:
def _display_gregorian(self,date_val): def _display_gregorian(self,date_val):
year = self._slash_year(date_val[2],date_val[3]) year = self._slash_year(date_val[2],date_val[3])
if self.format == 0: if self.format == 0:
value = self.display_iso(date_val) return self.display_iso(date_val)
elif self.format == 1: elif self.format == 1:
if date_val[0] == 0 and date_val[1] == 0: if date_val[0] == 0 and date_val[1] == 0:
value = str(date_val[2]) value = str(date_val[2])
else: else:
value = self._tformat.replace('%m',str(date_val[1])) value = self._tformat.replace('%m',str(date_val[1]))
value = value.replace('%d',str(date_val[0])) value = value.replace('%d',str(date_val[0]))
value = value.replace('%Y',str(date_val[2])) value = value.replace('%Y',str(abs(date_val[2])))
elif self.format == 2: elif self.format == 2:
# Month Day, Year # Month Day, Year
if date_val[0] == 0: if date_val[0] == 0:
@ -265,24 +264,32 @@ class DateDisplay:
value = "%s %s" % (self._MONS[date_val[1]],year) value = "%s %s" % (self._MONS[date_val[1]],year)
else: else:
value = "%d %s %s" % (date_val[0],self._MONS[date_val[1]],year) value = "%d %s %s" % (date_val[0],self._MONS[date_val[1]],year)
return value if date_val[2] < 0:
return self._bce_str % value
else:
return value
def _display_julian(self,date_val): def _display_julian(self,date_val):
# Julian date display is the same as Gregorian # Julian date display is the same as Gregorian
return self._display_gregorian(date_val) return self._display_gregorian(date_val)
def _display_calendar(self,date_val,month_list): def _display_calendar(self,date_val,month_list):
year = date_val[2] year = abs(date_val[2])
if self.format == 0 or self.format == 1: if self.format == 0 or self.format == 1:
return self.display_iso(date_val) return self.display_iso(date_val)
else: else:
if date_val[0] == 0: if date_val[0] == 0:
if date_val[1] == 0: if date_val[1] == 0:
return year value = year
else: else:
return u"%s %d" % (month_list[date_val[1]],year) value = u"%s %d" % (month_list[date_val[1]],year)
else: else:
return u"%s %d, %s" % (month_list[date_val[1]],date_val[0],year) value = u"%s %d, %s" % (month_list[date_val[1]],date_val[0],year)
if date_val[2] < 0:
return self._bce_str % value
else:
return value
def _display_french(self,date_val): def _display_french(self,date_val):
return self._display_calendar(date_val,self._french) return self._display_calendar(date_val,self._french)