From c744be610dff270f1c0f0367f809b9df95aeea2d Mon Sep 17 00:00:00 2001 From: fujiwarat Date: Wed, 10 Feb 2021 20:50:11 +0900 Subject: setup: Set ANTHY_PC in _config.py Forgot to update setup/Makefile besides engine/Makefile Also delete deprecated gettext.bind_textdomain_codeset() --- setup/python2/Makefile.am | 3 ++- setup/python3/Makefile.am | 3 ++- 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 # Copyright (c) 2009 Hideaki ABE -# Copyright (c) 2010-2017 Takao Fujiwara +# Copyright (c) 2010-2021 Takao Fujiwara # 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 # Copyright (c) 2009 Hideaki ABE -# Copyright (c) 2010-2017 Takao Fujiwara +# Copyright (c) 2010-2021 Takao Fujiwara # 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 # Copyright (c) 2009 Hideaki ABE -# Copyright (c) 2010-2019 Takao Fujiwara +# Copyright (c) 2010-2021 Takao Fujiwara # 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() -- cgit v1.2.1