Calendar formats added
svn: r1241
This commit is contained in:
Don Allingham
262
src/Date.py
262
src/Date.py
@ -247,24 +247,6 @@ class Date:
|
||||
def isRange(self):
|
||||
return self.range == 1
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def set_format_code(code):
|
||||
global _func
|
||||
Date.formatCode = code
|
||||
_func = SingleDate.fmtFunc[code]
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def get_format_code():
|
||||
return Date.formatCode
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
@ -360,248 +342,6 @@ class SingleDate:
|
||||
d = "-%02d" % self.day
|
||||
return "%s%s%s" % (y,m,d)
|
||||
|
||||
def _format1(self):
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF:
|
||||
return ""
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
retval = _mname[self.month]
|
||||
else:
|
||||
try:
|
||||
retval = "%s %d" % (_mname[self.month],self.year)
|
||||
except:
|
||||
retval = "**** %d %d %d ****" % (self.year,self.month,self.day)
|
||||
elif self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
else:
|
||||
try:
|
||||
month = _mname[self.month]
|
||||
except:
|
||||
month = "<ILLEGAL MONTH>"
|
||||
if self.year == UNDEF:
|
||||
retval = "%s %d, ????" % (month,self.day)
|
||||
else:
|
||||
retval = "%s %d, %d" % (month,self.day,self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = _("about") + ' ' + retval
|
||||
elif self.mode == Calendar.BEFORE:
|
||||
retval = _("before") + ' ' + retval
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = _("after") + ' ' + retval
|
||||
return retval
|
||||
|
||||
def _format2(self):
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
return ""
|
||||
elif self.month != UNDEF and self.month != UNDEF:
|
||||
month = _mname[self.month]
|
||||
if self.year == UNDEF:
|
||||
retval = "%s %d, ????" % (string.upper(month[0:3]),self.day)
|
||||
else:
|
||||
retval = "%s %d, %d" % (string.upper(month[0:3]),self.day,self.year)
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
month = _mname[self.month]
|
||||
retval = string.upper(month[0:3])
|
||||
else:
|
||||
month = _mname[self.month]
|
||||
retval = "%s %d" % (string.upper(month[0:3]),self.year)
|
||||
else:
|
||||
retval = str(self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("abt"),retval)
|
||||
elif self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("before"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("after"),retval)
|
||||
|
||||
return retval
|
||||
|
||||
def _format3(self):
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
return ""
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
month = _mname[self.month]
|
||||
retval = string.upper(month[0:3])
|
||||
else:
|
||||
month = _mname[self.month]
|
||||
retval = "%s %d" % (string.upper(month[0:3]),self.year)
|
||||
elif self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
else:
|
||||
month = _mname[self.month]
|
||||
if self.year == UNDEF:
|
||||
retval = "%d %s ????" % (self.day,string.upper(month[0:3]))
|
||||
else:
|
||||
retval = "%d %s %d" % (self.day,string.upper(month[0:3]),self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("ABOUT"),retval)
|
||||
elif self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("BEFORE"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("AFTER"),retval)
|
||||
return retval
|
||||
|
||||
def _format10(self):
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
return ""
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
retval = _mname[self.month]
|
||||
else:
|
||||
month = _mname[self.month]
|
||||
retval = "%s %d" % (month,self.year)
|
||||
elif self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
else:
|
||||
month = _mname[self.month]
|
||||
if self.year == UNDEF:
|
||||
retval = "%d. %s ????" % (self.day,month)
|
||||
else:
|
||||
retval = "%d. %s %d" % (self.day,month,self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("ABOUT"),retval)
|
||||
elif self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("BEFORE"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("AFTER"),retval)
|
||||
|
||||
return retval
|
||||
|
||||
def _get_mmddyyyy(self,sep):
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
return ""
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
retval = "%02d%s??%s??" % (self.month+1,sep,sep)
|
||||
else:
|
||||
retval = "%02d%s??%s%04d" % (self.month+1,sep,sep,self.year)
|
||||
elif self.month == UNDEF:
|
||||
retval = "??%s%02d%s%04d" % (sep,self.day,sep,self.year)
|
||||
else:
|
||||
if self.year == UNDEF:
|
||||
retval = "%02d%s%02d%s????" % (self.month+1,sep,self.day,sep)
|
||||
else:
|
||||
retval = "%02d%s%02d%s%04d" % (self.month+1,sep,self.day,sep,self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("ABOUT"),retval)
|
||||
elif self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("BEFORE"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("AFTER"),retval)
|
||||
|
||||
return retval
|
||||
|
||||
def _get_yyyymmdd(self,sep):
|
||||
retval = ""
|
||||
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
pass
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
retval = "????%s%02d%s??" % (sep,self.month+1,sep)
|
||||
else:
|
||||
retval = "%04d%s%02d" % (self.year,sep,self.month+1)
|
||||
elif self.month == UNDEF:
|
||||
retval = "%04d%s??%s%02d" % (self.year,sep,sep,self.day)
|
||||
else:
|
||||
if self.year == UNDEF:
|
||||
retval = "????%s%02d%s%02d" % (sep,self.month+1,sep,self.day)
|
||||
else:
|
||||
retval = "%02d%s%02d%s%02d" % (self.year,sep,self.month+1,sep,self.day)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("about"),retval)
|
||||
|
||||
if self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("before"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("after"),retval)
|
||||
|
||||
return retval
|
||||
|
||||
def _format4(self):
|
||||
return self._get_mmddyyyy("/")
|
||||
|
||||
def _format5(self):
|
||||
return self._get_mmddyyyy("-")
|
||||
|
||||
def _format8(self):
|
||||
return self._get_mmddyyyy(".")
|
||||
|
||||
def _get_ddmmyyyy(self,sep):
|
||||
retval = ""
|
||||
|
||||
if self.month == UNDEF and self.day == UNDEF and self.year == UNDEF :
|
||||
pass
|
||||
elif self.day == UNDEF:
|
||||
if self.month == UNDEF:
|
||||
retval = str(self.year)
|
||||
elif self.year == UNDEF:
|
||||
retval = "??%s%02d%s??" % (sep,self.month+1,sep)
|
||||
else:
|
||||
retval = "??%s%02d%s%04d" % (sep,self.month+1,sep,self.year)
|
||||
elif self.month == UNDEF:
|
||||
retval = "%02d%s??%s%04d" % (self.day,sep,sep,self.year)
|
||||
else:
|
||||
if self.year == UNDEF:
|
||||
retval = "%02d%s%02d%s????" % (self.day,sep,self.month+1,sep)
|
||||
else:
|
||||
retval = "%02d%s%02d%s%04d" % (self.day,sep,self.month+1,sep,self.year)
|
||||
|
||||
if self.mode == Calendar.ABOUT:
|
||||
retval = "%s %s" % (_("ABOUT"),retval)
|
||||
if self.mode == Calendar.BEFORE:
|
||||
retval = "%s %s" % (_("BEFORE"),retval)
|
||||
elif self.mode == Calendar.AFTER:
|
||||
retval = "%s %s" % (_("AFTER"),retval)
|
||||
|
||||
return retval
|
||||
|
||||
def _format6(self):
|
||||
return self._get_ddmmyyyy("/")
|
||||
|
||||
def _format7(self):
|
||||
return self._get_ddmmyyyy("-")
|
||||
|
||||
def _format9(self):
|
||||
return self._get_ddmmyyyy(".")
|
||||
|
||||
def _format11(self):
|
||||
return self._get_yyyymmdd("/")
|
||||
|
||||
def _format12(self):
|
||||
return self._get_yyyymmdd("-")
|
||||
|
||||
def _format13(self):
|
||||
return self._get_yyyymmdd(".")
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
#
|
||||
#
|
||||
#
|
||||
#--------------------------------------------------------------------
|
||||
fmtFunc = [ _format1, _format2, _format3, _format4, _format5, _format6,
|
||||
_format7, _format8, _format9, _format10, _format11, _format12,
|
||||
_format13]
|
||||
|
||||
def getDate(self):
|
||||
return self.calendar.display(self.year, self.month, self.day, self.mode)
|
||||
@ -691,8 +431,6 @@ def compare_dates(f,s):
|
||||
else:
|
||||
return cmp(first.day,second.day)
|
||||
|
||||
_func = SingleDate.fmtFunc[0]
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
|
||||
Reference in New Issue
Block a user