diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2021-02-10 20:50:11 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2021-02-10 20:50:11 +0900 |
| commit | c744be610dff270f1c0f0367f809b9df95aeea2d (patch) | |
| tree | 30d0360a4f0967f7da7f2ed3642aaad1b9880670 /setup | |
| parent | a07fe981b0b15d723013882316b6ed9207e92608 (diff) | |
| download | ibus-anthy-c744be610dff270f1c0f0367f809b9df95aeea2d.tar.gz | |
setup: Set ANTHY_PC in _config.py
Forgot to update setup/Makefile besides engine/Makefile
Also delete deprecated gettext.bind_textdomain_codeset()
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/python2/Makefile.am | 3 | ||||
| -rw-r--r-- | setup/python3/Makefile.am | 3 | ||||
| -rw-r--r-- | setup/python3/main.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/setup/python2/Makefile.am b/setup/python2/Makefile.am index 184e7e7..e501544 100644 --- a/setup/python2/Makefile.am +++ b/setup/python2/Makefile.am @@ -4,7 +4,7 @@ # # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com> # Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com> -# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com> +# Copyright (c) 2010-2021 Takao Fujiwara <takao.fujiwara1@gmail.com> # Copyright (c) 2007-2017 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify @@ -86,6 +86,7 @@ _config.py: _config.py.in sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \ -e "s|\@libexecdir\@|$(libexecdir)|g" \ -e "s|\@datadir\@|$(datadir)|g" \ + -e "s|\@ANTHY_PC\@|$(ANTHY_PC)|g" \ -e "s|\@LAYOUT\@|$(LAYOUT)|g" \ -e "s|\@SYMBOL_CHAR_INT\@|$(SYMBOL_CHAR_INT)|g" \ -e "s|\@ICON_PREFERENCE\@|$(ICON_PREFERENCE)|g" \ diff --git a/setup/python3/Makefile.am b/setup/python3/Makefile.am index 90b3aa1..1eb3747 100644 --- a/setup/python3/Makefile.am +++ b/setup/python3/Makefile.am @@ -4,7 +4,7 @@ # # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com> # Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com> -# Copyright (c) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com> +# Copyright (c) 2010-2021 Takao Fujiwara <takao.fujiwara1@gmail.com> # Copyright (c) 2007-2017 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify @@ -86,6 +86,7 @@ _config.py: _config.py.in sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \ -e "s|\@libexecdir\@|$(libexecdir)|g" \ -e "s|\@datadir\@|$(datadir)|g" \ + -e "s|\@ANTHY_PC\@|$(ANTHY_PC)|g" \ -e "s|\@LAYOUT\@|$(LAYOUT)|g" \ -e "s|\@SYMBOL_CHAR_INT\@|$(SYMBOL_CHAR_INT)|g" \ -e "s|\@ICON_PREFERENCE\@|$(ICON_PREFERENCE)|g" \ diff --git a/setup/python3/main.py b/setup/python3/main.py index 340e8ef..7e16093 100644 --- a/setup/python3/main.py +++ b/setup/python3/main.py @@ -4,7 +4,7 @@ # # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com> # Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com> -# Copyright (c) 2010-2019 Takao Fujiwara <takao.fujiwara1@gmail.com> +# Copyright (c) 2010-2021 Takao Fujiwara <takao.fujiwara1@gmail.com> # Copyright (c) 2007-2019 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify @@ -76,7 +76,6 @@ class AnthySetup(object): except AttributeError: pass gettext.bindtextdomain(DOMAINNAME, config.LOCALEDIR) - gettext.bind_textdomain_codeset(DOMAINNAME, 'UTF-8') self.__prefs = AnthyPrefs() |