diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 6f3993d39..be4db2f7f 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-05-25 Don Allingham + * src/DateDisplay.py: properly encode french republican dates as unicode + 2005-05-26 Martin Hawlisch * src/EditSource.py (DelSrcQuery.query_response), src/EditPlace.py (DeletePlaceQuery.query_response), diff --git a/gramps2/src/DateDisplay.py b/gramps2/src/DateDisplay.py index 139617cc2..fd785fda4 100644 --- a/gramps2/src/DateDisplay.py +++ b/gramps2/src/DateDisplay.py @@ -83,11 +83,20 @@ class DateDisplay: ) _french = ( - '', u'Vend\xc3\xa9miaire', 'Brumaire', - 'Frimaire', u'Niv\xc3\xb4se', u'Pluvi\xc3\xb4se', - u'Vent\xc3\xb4se', 'Germinal', u'Flor\xc3\xa9al', - 'Prairial', 'Messidor', 'Thermidor', - 'Fructidor', 'Extra' + '', + unicode("Vendémiaire",'latin-1'), + 'Brumaire', + 'Frimaire', + unicode("Nivôse",'latin-1'), + unicode("Pluviôse",'latin-1'), + unicode("Ventôse",'latin-1'), + 'Germinal', + unicode("Floréal",'latin-1'), + 'Prairial', + 'Messidor', + 'Thermidor', + 'Fructidor', + 'Extra' ) _persian = ( @@ -271,9 +280,9 @@ class DateDisplay: if date_val[1] == 0: return year else: - return "%s %d" % (month_list[date_val[1]],year) + return u"%s %d" % (month_list[date_val[1]],year) else: - return "%s %d, %s" % (month_list[date_val[1]],date_val[0],year) + return u"%s %d, %s" % (month_list[date_val[1]],date_val[0],year) def _display_french(self,date_val): return self._display_calendar(date_val,self._french)