diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index d9ce11954..b58084f2d 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,6 +1,10 @@ 2005-05-09 Alex Roitman * doc/gramps-manual/C/authors.xml: Update. + * src/DisplayModels.py (column_change): Use localized time string. + * src/PeopleModel.py (column_change): Use localized time string. + * src/RelLib.py (get_change_display): Use localized time string. + 2005-05-09 Baruch Even * src/plugins/GraphViz.py (parse_user_options): Use 'justyears'. diff --git a/gramps2/src/DisplayModels.py b/gramps2/src/DisplayModels.py index 1fdc5adf8..858a218a3 100644 --- a/gramps2/src/DisplayModels.py +++ b/gramps2/src/DisplayModels.py @@ -17,6 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# $Id$ #------------------------------------------------------------------------- # @@ -25,6 +26,7 @@ #------------------------------------------------------------------------- import time from gettext import gettext as _ +import locale #------------------------------------------------------------------------- # @@ -44,6 +46,14 @@ import DateHandler _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] +#------------------------------------------------------------------------- +# +# Localized constants +# +#------------------------------------------------------------------------- +_date_format = locale.nl_langinfo(locale.D_T_FMT) +_codeset = locale.nl_langinfo(locale.CODESET) + #------------------------------------------------------------------------- # # BaseModel @@ -281,7 +291,8 @@ class SourceModel(BaseModel): return unicode(data[4]) def column_change(self,data): - return unicode(time.asctime(time.localtime(data[8]))) + return unicode(time.strftime(_date_format,time.localtime(data[8])), + _codeset) #------------------------------------------------------------------------- # @@ -364,7 +375,8 @@ class PlaceModel(BaseModel): return u'' def column_change(self,data): - return unicode(time.asctime(time.localtime(data[11]))) + return unicode(time.strftime(_date_format,time.localtime(data[11])), + _codeset) #------------------------------------------------------------------------- # @@ -423,4 +435,5 @@ class MediaModel(BaseModel): return unicode(data[0]) def column_change(self,data): - return unicode(time.asctime(time.localtime(data[8]))) + return unicode(time.strftime(_date_format,time.localtime(data[8])), + _codeset) diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py index 498bf2dd3..5f046c4ce 100644 --- a/gramps2/src/PeopleModel.py +++ b/gramps2/src/PeopleModel.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2004 Donald N. Allingham +# Copyright (C) 2000-2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,6 +47,14 @@ import pango from RelLib import * import NameDisplay +#------------------------------------------------------------------------- +# +# Localized constants +# +#------------------------------------------------------------------------- +_date_format = locale.nl_langinfo(locale.D_T_FMT) +_codeset = locale.nl_langinfo(locale.CODESET) + #------------------------------------------------------------------------- # # constants @@ -280,7 +288,9 @@ class PeopleModel(gtk.GenericTreeModel): return data[_ID_COL] def column_change(self,data,node): - return time.asctime(time.localtime(data[_CHANGE_COL])) + return unicode(time.strftime(_date_format, + time.localtime(data[_CHANGE_COL])), + _codeset) def column_gender(self,data,node): return _GENDER[data[_GENDER_COL]] diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 51dea7f00..1da46443d 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -34,6 +34,7 @@ from gettext import gettext as _ import os import time import re +import locale #------------------------------------------------------------------------- # @@ -48,13 +49,20 @@ import DateHandler # Confidence levels # #------------------------------------------------------------------------- - CONF_VERY_HIGH = 4 CONF_HIGH = 3 CONF_NORMAL = 2 CONF_LOW = 1 CONF_VERY_LOW = 0 +#------------------------------------------------------------------------- +# +# Localized constants +# +#------------------------------------------------------------------------- +_date_format = locale.nl_langinfo(locale.D_T_FMT) +_codeset = locale.nl_langinfo(locale.CODESET) + #------------------------------------------------------------------------- # # Base classes @@ -231,7 +239,9 @@ class PrimaryObject(BaseObject): """ if self.change: - return time.asctime(time.localtime(self.change)) + return unicode(time.strftime(_date_format, + time.localtime(self.change)), + _codeset) else: return ''