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

Request #3083: To display /Day month year/ on Date_fr.py

Browse Source 
svn: r12766
This commit is contained in:
Jérôme Rapinat 2009-07-06 09:59:54 +00:00
parent f7efb09734
commit f213382d3a
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/DateHandler/_Date_fr.py
View File

@ -201,6 +201,7 @@ class DateParserFR(DateParser):
# This self._text are different from the base # This self._text are different from the base
# by adding ".?" after the first date and removing "\s*$" at the end # by adding ".?" after the first date and removing "\s*$" at the end
#gregorian and julian #gregorian and julian
self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' % self._text2 = re.compile('(\d+)?.?\s+?%s\s*((\d+)(/\d+)?)?' %
@ -254,7 +255,8 @@ class DateDisplayFR(DateDisplay):
_bce_str = u"%s avant le calendrier" _bce_str = u"%s avant le calendrier"
formats = ("AAAA-MM-JJ (ISO)", "Numérique", "Mois Jour, Année", formats = ("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",
"Jour Mois Année", "Jour MOI Année")
def _display_gregorian(self, date_val): def _display_gregorian(self, date_val):
""" """
@ -318,7 +320,7 @@ class DateDisplayFR(DateDisplay):
value = "%d. %s %s" % (date_val[0], (self._months)[date_val[1]], value = "%d. %s %s" % (date_val[0], (self._months)[date_val[1]],
year) year)
else: elif self.format == 5:
# Day. MON Year # Day. MON Year
@ -334,6 +336,34 @@ class DateDisplayFR(DateDisplay):
value = "%d.%s %s" % (date_val[0], (self.MONS)[date_val[1]], value = "%d.%s %s" % (date_val[0], (self.MONS)[date_val[1]],
year) year)
elif self.format == 6:
# Day Month Year
if date_val[0] == 0:
if date_val[1] == 0:
value = year
else:
value = "%s %s" % ((self._months)[date_val[1]], year)
else:
value = "%d %s %s" % (date_val[0], (self._months)[date_val[1]],
year)
else:
# Day MON Year
if date_val[0] == 0:
if date_val[1] == 0:
value = year
else:
value = "%s %s" % ((self.MONS)[date_val[1]], year)
else:
value = "%d %s %s" % (date_val[0], (self.MONS)[date_val[1]],
year)
if date_val[2] < 0: if date_val[2] < 0:
return self._bce_str % value return self._bce_str % value
else: else: