Remove redundant calendar function from DateHandler.

svn: r14124
This commit is contained in:
Brian Matherly 2010-01-25 04:53:45 +00:00
parent 7fefcaead5
commit 1f4043b37a
2 changed files with 2 additions and 14 deletions

View File

@ -30,7 +30,6 @@ Class handling language-specific selection for date parser and displayer.
#
#-------------------------------------------------------------------------
from DateHandler import LANG_TO_DISPLAY, LANG, parser, displayer
import gen.lib.date
#--------------------------------------------------------------
#
@ -81,14 +80,3 @@ def get_date(date_base) :
def get_date_valid(date_base):
date_obj = date_base.get_date_object()
return date_obj.get_valid()
def get_calendar_formats():
"""
Return the list of supported calendars.
"""
cal = []
for calendar in gen.lib.date.Date.ui_calendar_names:
cal.append(calendar)
return cal

View File

@ -51,6 +51,7 @@ from gen.display.name import displayer as _nd
from gen.display.name import NameDisplayError
import Utils
from gen.lib import Name
import gen.lib
import ManagedWindow
from gui.widgets import MarkupLabel, BasicLabel
from QuestionDialog import ErrorDialog, QuestionDialog2, OkDialog
@ -688,8 +689,7 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
# Calendar format on report:
obox = gtk.combo_box_new_text()
formats = DateHandler.get_calendar_formats()
for item in formats:
for item in gen.lib.Date.ui_calendar_names:
obox.append_text(item)
active = config.get('preferences.calendar-format-report')
if active >= len(formats):