From b22b533846e89a0d41f6597b795596e1330f6d2b Mon Sep 17 00:00:00 2001 From: Vassilii Khachaturov Date: Sat, 14 Sep 2013 21:43:36 +0000 Subject: [PATCH] 7066: some massaging of ICU version, still fails svn: r23129 --- gramps/gen/lib/calendar.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gramps/gen/lib/calendar.py b/gramps/gen/lib/calendar.py index e50850438..e4007b249 100644 --- a/gramps/gen/lib/calendar.py +++ b/gramps/gen/lib/calendar.py @@ -585,15 +585,17 @@ except ImportError: try: from icu import Locale, GregorianCalendar, Calendar _hcal = Calendar.createInstance( - Locale.createFromName('@calendar=hebrew')) + Locale.createFromName('C@calendar=hebrew')) def hebrew_ymd(sdn): y,m,d = gregorian_ymd(sdn) gcal = GregorianCalendar() - gcal.set(y,m,d) + gcal.clear() + gcal.set(y,m,d, 11, 59) + _hcal.clear() _hcal.setTime( gcal.getTime() ) return (_hcal.get(Calendar.YEAR), _hcal.get(Calendar.MONTH), - _hcal.get(Calendar.DAY_OF_YEAR)) + _hcal.get(Calendar.DATE)) # Not much better than our version... fails on 1789-11-4(hebrew), # unlike sdn!