40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
|
From ff13b86247701950d525a3949c31dc94885f63eb Mon Sep 17 00:00:00 2001
|
||
|
|
From: yangxianzhao <yangxianzhao@uniontech.com>
|
||
|
|
Date: Fri, 15 Sep 2023 10:45:17 +0800
|
||
|
|
Subject: [PATCH] Fix ibus setup startup failure
|
||
|
|
|
||
|
|
---
|
||
|
|
setup/i18n.py | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/setup/i18n.py b/setup/i18n.py
|
||
|
|
index 976d1ae..182022b 100644
|
||
|
|
--- a/setup/i18n.py
|
||
|
|
+++ b/setup/i18n.py
|
||
|
|
@@ -23,9 +23,11 @@
|
||
|
|
import locale
|
||
|
|
import gettext
|
||
|
|
import os
|
||
|
|
+import sys
|
||
|
|
|
||
|
|
DOMAINNAME = "ibus10"
|
||
|
|
|
||
|
|
+PY3K = sys.version_info >= (3, 0)
|
||
|
|
_ = lambda a: gettext.dgettext(DOMAINNAME, a)
|
||
|
|
N_ = lambda a: a
|
||
|
|
|
||
|
|
@@ -42,7 +44,9 @@ def init_textdomain(domainname):
|
||
|
|
except AttributeError:
|
||
|
|
pass
|
||
|
|
gettext.bindtextdomain(domainname, LOCALEDIR)
|
||
|
|
- gettext.bind_textdomain_codeset(domainname, 'UTF-8')
|
||
|
|
+ # https://docs.python.org/3/library/gettext.html#gettext.lgettext
|
||
|
|
+ if not PY3K:
|
||
|
|
+ gettext.bind_textdomain_codeset(domainname, 'UTF-8')
|
||
|
|
|
||
|
|
def gettext_engine_longname(engine):
|
||
|
|
name = engine.get_name()
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|