add translation for negatives dates (B.C.E)
svn: r8939
This commit is contained in:
parent
e314d3b99d
commit
035aa380a0
@ -100,8 +100,18 @@ class DateParserFR(DateParser):
|
|||||||
month_to_int[u"wintermonat"] = 2
|
month_to_int[u"wintermonat"] = 2
|
||||||
month_to_int[u"taumond"] = 2
|
month_to_int[u"taumond"] = 2
|
||||||
month_to_int[u"narrenmond"] = 2
|
month_to_int[u"narrenmond"] = 2
|
||||||
|
month_to_int[u"lenzing"] = 3
|
||||||
|
month_to_int[u"ostermond"] = 4
|
||||||
|
month_to_int[u"wonnemond"] = 5
|
||||||
month_to_int[u"wiesenmonat"] = 5
|
month_to_int[u"wiesenmonat"] = 5
|
||||||
month_to_int[u"nebelmonat"] = 10
|
month_to_int[u"brachet"] = 6
|
||||||
|
month_to_int[u"heuet"] = 7
|
||||||
|
month_to_int[u"ernting"] = 8
|
||||||
|
month_to_int[u"scheiding"] = 9
|
||||||
|
month_to_int[u"gilbhard"] = 10
|
||||||
|
month_to_int[u"nebelmonat"] = 11
|
||||||
|
month_to_int[u"nebelung"] = 11
|
||||||
|
month_to_int[u"julmond"] = 12
|
||||||
|
|
||||||
modifier_to_int = {
|
modifier_to_int = {
|
||||||
u'avant' : Date.MOD_BEFORE,
|
u'avant' : Date.MOD_BEFORE,
|
||||||
@ -147,11 +157,13 @@ class DateParserFR(DateParser):
|
|||||||
u'compt.' : Date.QUAL_CALCULATED,
|
u'compt.' : Date.QUAL_CALCULATED,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bce = [u"avant le calendrier", u"avant notre ère",
|
||||||
|
u"avant JC", u"avant J.C"] + DateParser.bce
|
||||||
|
|
||||||
def init_strings(self):
|
def init_strings(self):
|
||||||
DateParser.init_strings(self)
|
DateParser.init_strings(self)
|
||||||
# This self._numeric is different from the base
|
# This self._numeric is different from the base
|
||||||
# by allowing space after the slash/dot (need by fr_CH)
|
# avoid bug gregorian / french calendar conversion (+/-10 days)
|
||||||
# and avoid bug gregorian / french calendar conversion (+/-10 days)
|
|
||||||
self._numeric = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
|
self._numeric = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\s*$")
|
||||||
self._span = re.compile(u"(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)", re.IGNORECASE)
|
self._span = re.compile(u"(de)\s+(?P<start>.+)\s+(à)\s+(?P<stop>.+)", re.IGNORECASE)
|
||||||
self._range = re.compile(u"(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)", re.IGNORECASE)
|
self._range = re.compile(u"(entre|ent\.|ent)\s+(?P<start>.+)\s+(et)\s+(?P<stop>.+)", re.IGNORECASE)
|
||||||
@ -189,6 +201,8 @@ class DateDisplayFR(DateDisplay):
|
|||||||
|
|
||||||
_qual_str = ("", u"estimée ", u"calculée ", "")
|
_qual_str = ("", u"estimée ", u"calculée ", "")
|
||||||
|
|
||||||
|
_bce_str = u"%s avant le calendrier"
|
||||||
|
|
||||||
formats = (
|
formats = (
|
||||||
"AAAA-MM-JJ (ISO)", "Numérique", "Mois Jour, Année",
|
"AAAA-MM-JJ (ISO)", "Numérique", "Mois Jour, Année",
|
||||||
"MOI Jour, Année", "Jour Mois, Année", "Jour MOI Année"
|
"MOI Jour, Année", "Jour Mois, Année", "Jour MOI Année"
|
||||||
@ -284,6 +298,7 @@ class DateDisplayFR(DateDisplay):
|
|||||||
text = self.display_cal[date.get_calendar()](start)
|
text = self.display_cal[date.get_calendar()](start)
|
||||||
return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
|
return "%s%s%s%s" % (qual_str, self._mod_str[mod], text, self.calendar[cal])
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# Register classes
|
# Register classes
|
||||||
|
Loading…
Reference in New Issue
Block a user