Merge from 2.0.1

svn: r4666
This commit is contained in:
Alex Roitman
2005-05-24 13:08:06 +00:00
parent 16b52bcb0f
commit ce05310959
73 changed files with 21569 additions and 14199 deletions

View File

@ -80,7 +80,7 @@ def get_date_formats():
try:
return _lang_to_display[_lang].formats
except:
return DateDisplay.DateDisplay.formats
return _lang_to_display["C"].formats
def set_format(value):
try:
@ -126,17 +126,19 @@ try:
parser = _lang_to_parser[_lang]()
except:
print "Date parser for",_lang,"not available, using default"
parser = DateParser.DateParser()
parser = _lang_to_parser["C"]()
try:
import GrampsKeys
val = GrampsKeys.get_date_format(_lang_to_display[_lang].formats)
except:
val = 0
try:
val = GrampsKeys.get_date_format(_lang_to_display["C"].formats)
except:
val = 0
try:
displayer = _lang_to_display[_lang](val)
except:
print "Date displayer for",_lang,"not available, using default"
displayer = DateDisplay.DateDisplay(val)
displayer = _lang_to_display["C"](val)