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

2730: numeric dates on windows not correct

Browse Source 
svn: r12142
This commit is contained in:
Benny Malengier 2009-02-27 07:35:29 +00:00
parent 844cb231c7
commit fbd2afdf8c
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/GrampsLocale/_GrampsLocale.py
View File

@ -124,6 +124,9 @@ try:
) )
tformat = locale.nl_langinfo(locale.D_FMT).replace('%y','%Y') tformat = locale.nl_langinfo(locale.D_FMT).replace('%y','%Y')
# GRAMPS treats dates with '-' as ISO format, so replace separator on
# locale dates that use '-' to prevent confict
tformat = tformat.replace('-', '/')
except: except:
import time import time
@ -220,7 +223,28 @@ except:
unicode(time.strftime('%a',(0,1,1,1,1,1,5,1,1)),codeset), # Saturday unicode(time.strftime('%a',(0,1,1,1,1,1,5,1,1)),codeset), # Saturday
) )
if time.strftime('%x',(2005,1,2,1,1,1,1,1,1)) == '2/1/2005': # depending on the locale, the value returned for 20th Feb 2009 could be
tformat = '%d/%m/%y' # of the format '20/2/2009', '20/02/2009', '20.2.2009', '20.02.2009',
else: # '20-2-2009', '20-02-2009', '2009/02/20', '2009.02.20', '2009-02-20',
tformat = '%m/%d/%y' # '09-02-20' hence to reduce the possible values to test, make sure month
# is double digit also day should be double digit, prefebably greater than
# 12 for human readablity
timestr = time.strftime('%x',(2005,10,25,1,1,1,1,1,1))
# GRAMPS treats dates with '-' as ISO format, so replace separator on
# locale dates that use '-' to prevent confict
timestr = timestr.replace('-', '/')
time2fmt_map = {
'25/10/2005' : '%d/%m/%Y',
'10/25/2005' : '%m/%d/%Y',
'2005/10/25' : '%Y/%m/%d',
'25.10.2005' : '%d.%m.%Y',
'10.25.2005' : '%m.%d.%Y',
'2005.10.25' : '%Y.%m.%d',
}
try:
tformat = time2fmt_map[timestr]
except KeyError, e:
tformat = '%d/%m/%Y' #default value