From dcd9f98ae004cfb1270d472adc9cafcca0e625da Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 7 Mar 2019 17:41:11 +0800 Subject: Use gettext --- Makefile.am | 2 +- configure.ac | 4 ++-- data/Makefile.am | 22 +++++++---------- data/ibus-setup-libbopomofo.desktop.in | 14 +++++++++++ data/ibus-setup-libbopomofo.desktop.in.in | 14 ----------- data/ibus-setup-libpinyin.desktop.in | 14 +++++++++++ data/ibus-setup-libpinyin.desktop.in.in | 14 ----------- m4/Makefile.am | 2 +- po/Makevars | 39 ++++++++++++++++++++++++++++++- po/POTFILES.in | 6 ++--- po/POTFILES.skip | 4 ++-- 11 files changed, 83 insertions(+), 52 deletions(-) create mode 100644 data/ibus-setup-libbopomofo.desktop.in delete mode 100644 data/ibus-setup-libbopomofo.desktop.in.in create mode 100644 data/ibus-setup-libpinyin.desktop.in delete mode 100644 data/ibus-setup-libpinyin.desktop.in.in diff --git a/Makefile.am b/Makefile.am index 9311a8a..ed0262c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = \ +EXTRA_DIST = config.rpath \ autogen.sh \ ibus-libpinyin.spec.in \ $(NULL) diff --git a/configure.ac b/configure.ac index 57d1226..a7b0a67 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,6 @@ AC_PROG_CXX AM_PROG_CC_C_O AC_ISC_POSIX AC_HEADER_STDC -IT_PROG_INTLTOOL([0.35.0]) AM_PROG_LIBTOOL AC_PROG_SED @@ -148,7 +147,8 @@ GETTEXT_PACKAGE=ibus-libpinyin AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -AM_GLIB_GNU_GETTEXT +AM_GNU_GETTEXT_VERSION([0.19.7]) +AM_GNU_GETTEXT([external]) # Checks for GSettings. PKG_CHECK_MODULES(GIO2, [gio-2.0 >= 2.26.0]) diff --git a/data/Makefile.am b/data/Makefile.am index cf5a80b..2cec20e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -58,26 +58,21 @@ appdatadir = @datadir@/appdata appdata_DATA = $(APPDATA_XML) -desktop_in_in_files = \ - ibus-setup-libbopomofo.desktop.in.in \ - ibus-setup-libpinyin.desktop.in.in \ +desktop_in_files = \ + ibus-setup-libbopomofo.desktop.in \ + ibus-setup-libpinyin.desktop.in \ $(NULL) -desktop_in_files = $(desktop_in_in_files:.in.in=.in) +desktop_files = $(desktop_in_files:.desktop.in=.desktop) -$(desktop_in_files): %.desktop.in: %.desktop.in.in Makefile - $(AM_V_GEN) sed \ - -e "s|\@libexecdir\@|$(libexecdir)|" \ - -e "s|\@pkgdatadir\@|$(pkgdatadir)|" \ - $< > $@.tmp && mv $@.tmp $@ +$(desktop_files): $(desktop_in_files) Makefile + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ desktopdir=$(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -@INTLTOOL_DESKTOP_RULE@ +desktop_DATA = $(desktop_files) EXTRA_DIST = \ - $(desktop_in_in_files) \ + $(desktop_in_files) \ $(WORDLIST) \ $(ENGLISH_AWK) \ $(STROKES) \ @@ -89,6 +84,5 @@ EXTRA_DIST = \ CLEANFILES = \ $(ENGLISH_DB) \ $(STROKES_DB) \ - $(desktop_in_files) \ $(desktop_DATA) \ $(NULL) diff --git a/data/ibus-setup-libbopomofo.desktop.in b/data/ibus-setup-libbopomofo.desktop.in new file mode 100644 index 0000000..0bd48a5 --- /dev/null +++ b/data/ibus-setup-libbopomofo.desktop.in @@ -0,0 +1,14 @@ +[Desktop Entry] +Name=IBus LibBopomofo Preferences +Name[zh_CN]=IBus 智能注音配置工具 +Name[zh_TW]=IBus 智能注音配置工具 +Name[zh_HK]=IBus 智能注音配置工具 +Comment=Set ibus-libbopomofo Preferences +Comment[zh_CN]=设置 IBus 智能注音首选项 +Comment[zh_TW]=設定 IBus 智能注音個人偏好 +Comment[zh_HK]=設定 IBus 智能注音個人偏好 +Exec=@libexecdir@/ibus-setup-libpinyin libbopomofo +Icon=@pkgdatadir@/icons/ibus-bopomofo.svg +NoDisplay=true +Type=Application +StartupNotify=true diff --git a/data/ibus-setup-libbopomofo.desktop.in.in b/data/ibus-setup-libbopomofo.desktop.in.in deleted file mode 100644 index 0bd48a5..0000000 --- a/data/ibus-setup-libbopomofo.desktop.in.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=IBus LibBopomofo Preferences -Name[zh_CN]=IBus 智能注音配置工具 -Name[zh_TW]=IBus 智能注音配置工具 -Name[zh_HK]=IBus 智能注音配置工具 -Comment=Set ibus-libbopomofo Preferences -Comment[zh_CN]=设置 IBus 智能注音首选项 -Comment[zh_TW]=設定 IBus 智能注音個人偏好 -Comment[zh_HK]=設定 IBus 智能注音個人偏好 -Exec=@libexecdir@/ibus-setup-libpinyin libbopomofo -Icon=@pkgdatadir@/icons/ibus-bopomofo.svg -NoDisplay=true -Type=Application -StartupNotify=true diff --git a/data/ibus-setup-libpinyin.desktop.in b/data/ibus-setup-libpinyin.desktop.in new file mode 100644 index 0000000..481ba1b --- /dev/null +++ b/data/ibus-setup-libpinyin.desktop.in @@ -0,0 +1,14 @@ +[Desktop Entry] +Name=IBus LibPinyin Setup +Name[zh_CN]=IBus 智能拼音配置工具 +Name[zh_TW]=IBus 智能拼音配置工具 +Name[zh_HK]=IBus 智能拼音配置工具 +Comment=Set ibus-libpinyin Preferences +Comment[zh_CN]=设置 IBus 智能拼音首选项 +Comment[zh_TW]=設定 IBus 智能拼音個人偏好 +Comment[zh_HK]=設定 IBus 智能拼音個人偏好 +Exec=@libexecdir@/ibus-setup-libpinyin libpinyin +Icon=@pkgdatadir@/icons/ibus-pinyin.svg +NoDisplay=true +Type=Application +StartupNotify=true diff --git a/data/ibus-setup-libpinyin.desktop.in.in b/data/ibus-setup-libpinyin.desktop.in.in deleted file mode 100644 index 481ba1b..0000000 --- a/data/ibus-setup-libpinyin.desktop.in.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=IBus LibPinyin Setup -Name[zh_CN]=IBus 智能拼音配置工具 -Name[zh_TW]=IBus 智能拼音配置工具 -Name[zh_HK]=IBus 智能拼音配置工具 -Comment=Set ibus-libpinyin Preferences -Comment[zh_CN]=设置 IBus 智能拼音首选项 -Comment[zh_TW]=設定 IBus 智能拼音個人偏好 -Comment[zh_HK]=設定 IBus 智能拼音個人偏好 -Exec=@libexecdir@/ibus-setup-libpinyin libpinyin -Icon=@pkgdatadir@/icons/ibus-pinyin.svg -NoDisplay=true -Type=Application -StartupNotify=true diff --git a/m4/Makefile.am b/m4/Makefile.am index 18323c8..df87385 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -18,6 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -EXTRA_DIST = \ +EXTRA_DIST = gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 \ as-version.m4 \ $(NULL) diff --git a/po/Makevars b/po/Makevars index 3e56bea..d30acd3 100644 --- a/po/Makevars +++ b/po/Makevars @@ -8,7 +8,7 @@ subdir = po top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --add-comments # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding @@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = Peng Huang +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -39,3 +46,33 @@ MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT) # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = no + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = no diff --git a/po/POTFILES.in b/po/POTFILES.in index 961aea8..6d319a9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -18,6 +18,6 @@ setup/config.py setup/dicttreeview.py setup/keyboardshortcut.py setup/shortcuteditor.py -[type: gettext/glade]setup/ibus-libpinyin-preferences.ui -data/ibus-setup-libpinyin.desktop.in.in -data/ibus-setup-libbopomofo.desktop.in.in +setup/ibus-libpinyin-preferences.ui +data/ibus-setup-libpinyin.desktop.in +data/ibus-setup-libbopomofo.desktop.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 48cb1b4..c078916 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,3 +1,3 @@ scripts/pydict.py -data/ibus-setup-libpinyin.desktop.in -data/ibus-setup-libbopomofo.desktop.in +data/ibus-setup-libpinyin.desktop +data/ibus-setup-libbopomofo.desktop -- cgit