first test for newyear support
svn: r15005
This commit is contained in:
parent
a6dd3e861d
commit
54172ab176
@ -58,14 +58,13 @@ class DateParserFR(DateParser):
|
|||||||
|
|
||||||
month_to_int = DateParser.month_to_int
|
month_to_int = DateParser.month_to_int
|
||||||
|
|
||||||
# Short months not the same as long months
|
# Custom short months not the same as long months
|
||||||
|
|
||||||
month_to_int[u"janv"] = 1
|
month_to_int[u"janv"] = 1
|
||||||
month_to_int[u"févr"] = 2
|
month_to_int[u"févr"] = 2
|
||||||
month_to_int[u"juil"] = 7
|
month_to_int[u"juil"] = 7
|
||||||
month_to_int[u"sept"] = 9
|
month_to_int[u"sept"] = 9
|
||||||
month_to_int[u"oct"] = 10
|
month_to_int[u"oct"] = 10
|
||||||
month_to_int[u"nov"] = 11
|
|
||||||
month_to_int[u"déc"] = 12
|
month_to_int[u"déc"] = 12
|
||||||
|
|
||||||
# Add common value
|
# Add common value
|
||||||
@ -170,6 +169,15 @@ class DateParserFR(DateParser):
|
|||||||
u's': Date.CAL_SWEDISH,
|
u's': Date.CAL_SWEDISH,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# newyear_to_int = DAteParser.newyear_to_int
|
||||||
|
|
||||||
|
newyear_to_int = {
|
||||||
|
u"1 jan": Date.NEWYEAR_JAN1,
|
||||||
|
u"1 mars": Date.NEWYEAR_MAR1,
|
||||||
|
u"25 mars": Date.NEWYEAR_MAR25,
|
||||||
|
u"1 sep" : Date.NEWYEAR_SEP1,
|
||||||
|
}
|
||||||
|
|
||||||
quality_to_int = {
|
quality_to_int = {
|
||||||
u'estimée': Date.QUAL_ESTIMATED,
|
u'estimée': Date.QUAL_ESTIMATED,
|
||||||
u'est.': Date.QUAL_ESTIMATED,
|
u'est.': Date.QUAL_ESTIMATED,
|
||||||
@ -240,7 +248,6 @@ class DateParserFR(DateParser):
|
|||||||
self._stext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
self._stext2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
|
||||||
self._smon_str, re.IGNORECASE)
|
self._smon_str, re.IGNORECASE)
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# French display
|
# French display
|
||||||
@ -257,8 +264,10 @@ class DateDisplayFR(DateDisplay):
|
|||||||
short_months = ( u"", u"janv", u"févr", u"mars", u"avril", u"mai", u"juin",
|
short_months = ( u"", u"janv", u"févr", u"mars", u"avril", u"mai", u"juin",
|
||||||
u"juil", u"août", u"sept", u"oct", u"nov", u"déc" )
|
u"juil", u"août", u"sept", u"oct", u"nov", u"déc" )
|
||||||
|
|
||||||
calendar = ("", u" (Julien)", u" (Hébreu)", u" (Révolutionnaire)",
|
calendar = ("", u"Julien", u"Hébreu", u"Révolutionnaire",
|
||||||
u" (Perse)", u" (Islamique)", u" (Suédois)")
|
u"Perse", u"Islamique", u"Suédois")
|
||||||
|
|
||||||
|
newyear = ("", u"1 mars", u"25 mars", u"1 sep")
|
||||||
|
|
||||||
_mod_str = ("", u"avant ", u"après ", u"vers ", "", "", "")
|
_mod_str = ("", u"avant ", u"après ", u"vers ", "", "", "")
|
||||||
|
|
||||||
@ -393,6 +402,7 @@ class DateDisplayFR(DateDisplay):
|
|||||||
cal = date.get_calendar()
|
cal = date.get_calendar()
|
||||||
qual = date.get_quality()
|
qual = date.get_quality()
|
||||||
start = date.get_start_date()
|
start = date.get_start_date()
|
||||||
|
newyear = date.get_new_year()
|
||||||
|
|
||||||
qual_str = (self._qual_str)[qual]
|
qual_str = (self._qual_str)[qual]
|
||||||
|
|
||||||
@ -403,18 +413,20 @@ class DateDisplayFR(DateDisplay):
|
|||||||
elif mod == Date.MOD_SPAN:
|
elif mod == Date.MOD_SPAN:
|
||||||
date1 = (self.display_cal)[cal](start)
|
date1 = (self.display_cal)[cal](start)
|
||||||
date2 = (self.display_cal)[cal](date.get_stop_date())
|
date2 = (self.display_cal)[cal](date.get_stop_date())
|
||||||
|
scal = self.format_extras(cal, newyear)
|
||||||
return "%s%s %s %s %s%s" % (qual_str, u'de', date1, u'à',
|
return "%s%s %s %s %s%s" % (qual_str, u'de', date1, u'à',
|
||||||
date2, (self.calendar)[cal])
|
date2, scal)
|
||||||
elif mod == Date.MOD_RANGE:
|
elif mod == Date.MOD_RANGE:
|
||||||
date1 = (self.display_cal)[cal](start)
|
date1 = (self.display_cal)[cal](start)
|
||||||
date2 = (self.display_cal)[cal](date.get_stop_date())
|
date2 = (self.display_cal)[cal](date.get_stop_date())
|
||||||
|
scal = self.format_extras(cal, newyear)
|
||||||
return "%s%s %s %s %s%s" % (qual_str, u'entre', date1, u'et',
|
return "%s%s %s %s %s%s" % (qual_str, u'entre', date1, u'et',
|
||||||
date2, (self.calendar)[cal])
|
date2, scal)
|
||||||
else:
|
else:
|
||||||
text = (self.display_cal)[date.get_calendar()](start)
|
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,
|
return "%s%s%s%s" % (qual_str, (self._mod_str)[mod], text,
|
||||||
(self.calendar)[cal])
|
scal)
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user