[meld: 1/2] fix intltool broken in win32 when run from source
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 1/2] fix intltool broken in win32 when run from source
- Date: Sat, 21 Dec 2019 00:24:41 +0000 (UTC)
commit df827107da40fe07d1806ccb69de0c75f49a84c4
Author: ThunderEX <thunderex gmail com>
Date: Fri Dec 6 16:29:09 2019 +0800
fix intltool broken in win32 when run from source
bin/meld | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 28607a84..571fd343 100755
--- a/bin/meld
+++ b/bin/meld
@@ -113,13 +113,16 @@ try:
if frozen:
libintl = cdll['libintl-8']
else:
- libintl = cdll.intl
- libintl.bindtextdomain(locale_domain, locale_dir)
+ try:
+ libintl = cdll.intl
+ except FileNotFoundError:
+ libintl = cdll['libintl-8']
+ libintl.bindtextdomain(locale_domain, str(locale_dir))
libintl.bind_textdomain_codeset(locale_domain, 'UTF-8')
libintl.textdomain(locale_domain)
del libintl
else:
- locale.bindtextdomain(locale_domain, locale_dir)
+ locale.bindtextdomain(locale_domain, str(locale_dir))
locale.bind_textdomain_codeset(locale_domain, 'UTF-8')
locale.textdomain(locale_domain)
except AttributeError as e:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]