From 8ead9aba9d8d31b66007463e26dd70534f1d6165 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 19 Nov 2003 17:20:05 +0000 Subject: [PATCH] * src/gramps.py: handle python versions with broken setlocale() * src/po/Makefile.am: don't pass -v to msgfmt svn: r2351 --- gramps2/src/gramps.py | 6 +++++- gramps2/src/po/Makefile.am | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index 5d464ca38..416a1f73a 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -54,7 +54,11 @@ if os.environ.has_key("GRAMPSI18N"): else: loc = "/usr/share/locale" -locale.setlocale(locale.LC_ALL,'') +try: + locale.setlocale(locale.LC_ALL,'') +except ValueError: + pass + gettext.bindtextdomain("gramps",loc) gtk.glade.bindtextdomain("gramps",loc) diff --git a/gramps2/src/po/Makefile.am b/gramps2/src/po/Makefile.am index 2104343e1..803f17e5f 100644 --- a/gramps2/src/po/Makefile.am +++ b/gramps2/src/po/Makefile.am @@ -21,11 +21,11 @@ SUFFIXES = .po .mo .po.mo: $(MSGCONV) --to-code=UTF-8 $< -o temp.po - $(MSGFMT) -v temp.po -o $@ + $(MSGFMT) temp.po -o $@ rm temp.po zh_CN.mo: $(top_srcdir)/src/po/zh_CN.po $(ICONV) -f GB2312 -t UTF-8 $< > temp.po - $(MSGFMT) -v temp.po -o $@ + $(MSGFMT) temp.po -o $@ rm temp.po