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

7158: refactor parsing of "today"

Browse Source 
prepare for localization - refactor the parsing of "today" in line with
other token parsing in DateParser, rather than using the hardwired text

Already possible to override per language, but I'll next add
a way to import a single translation of a "today" from the PO.

svn: r23407
This commit is contained in:
Vassilii Khachaturov 2013-10-25 16:15:40 +00:00
parent 9ffe6d13e3
commit e7f9431e80
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/gen/datehandler/_dateparser.py
View File

@ -303,6 +303,8 @@ class DateParser(object):
'calculated' : Date.QUAL_CALCULATED, 'calculated' : Date.QUAL_CALCULATED,
} }
# (overridden if a locale-specific date parser exists) # (overridden if a locale-specific date parser exists)
today = ["today",] # token(s) to regonise for today's date.
_langs = set() _langs = set()
def __init_prefix_tables(self): def __init_prefix_tables(self):
@ -392,6 +394,8 @@ class DateParser(object):
self._cal_str = self.re_longest_first(list(self.calendar_to_int.keys())) self._cal_str = self.re_longest_first(list(self.calendar_to_int.keys()))
self._ny_str = self.re_longest_first(list(self.newyear_to_int.keys())) self._ny_str = self.re_longest_first(list(self.newyear_to_int.keys()))
self._today_str = self.re_longest_first(self.today)
# bce, calendar type and quality may be either at the end or at # bce, calendar type and quality may be either at the end or at
# the beginning of the given date string, therefore they will # the beginning of the given date string, therefore they will
# be parsed from the middle and will be in match.group(2). # be parsed from the middle and will be in match.group(2).
@ -450,6 +454,7 @@ class DateParser(object):
self._isotimestamp = re.compile("^\s*?(\d{4})([01]\d)([0123]\d)(?:(?:[012]\d[0-5]\d[0-5]\d)|(?:\s+[012]\d:[0-5]\d(?::[0-5]\d)?))?\s*?$") self._isotimestamp = re.compile("^\s*?(\d{4})([01]\d)([0123]\d)(?:(?:[012]\d[0-5]\d[0-5]\d)|(?:\s+[012]\d:[0-5]\d(?::[0-5]\d)?))?\s*?$")
self._rfc = re.compile("(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+(\+|-)\d\d\d\d" self._rfc = re.compile("(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+(\+|-)\d\d\d\d"
% (self._rfc_day_str, self._rfc_mon_str)) % (self._rfc_day_str, self._rfc_mon_str))
self._today = re.compile("^\s*%s\s*$" % self._today_str, re.IGNORECASE)
def _get_int(self, val): def _get_int(self, val):
""" """
@ -629,7 +634,7 @@ class DateParser(object):
value = Date.EMPTY value = Date.EMPTY
return value return value
match = re.match("^\s*%s\s*$" % "today", text, re.IGNORECASE) match = self._today.match(text)
if match: if match:
today = Today() today = Today()
if cal: if cal: