summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2019-03-07 17:41:11 +0800
committerPeng Wu <alexepico@gmail.com>2019-03-07 18:40:45 +0800
commitdcd9f98ae004cfb1270d472adc9cafcca0e625da (patch)
tree3acbbaa67214ac7c3ded0a27ba9eea0b0ffd360d
parent730847008beb5af220c0a9b1b5c713ba23560984 (diff)
downloadibus-libpinyin-dcd9f98ae004cfb1270d472adc9cafcca0e625da.tar.gz
ibus-libpinyin-dcd9f98ae004cfb1270d472adc9cafcca0e625da.tar.xz
ibus-libpinyin-dcd9f98ae004cfb1270d472adc9cafcca0e625da.zip
Use gettext
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am22
-rw-r--r--data/ibus-setup-libbopomofo.desktop.in (renamed from data/ibus-setup-libbopomofo.desktop.in.in)0
-rw-r--r--data/ibus-setup-libpinyin.desktop.in (renamed from data/ibus-setup-libpinyin.desktop.in.in)0
-rw-r--r--m4/Makefile.am2
-rw-r--r--po/Makevars39
-rw-r--r--po/POTFILES.in6
-rw-r--r--po/POTFILES.skip4
9 files changed, 55 insertions, 24 deletions
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.in b/data/ibus-setup-libbopomofo.desktop.in
index 0bd48a5..0bd48a5 100644
--- a/data/ibus-setup-libbopomofo.desktop.in.in
+++ b/data/ibus-setup-libbopomofo.desktop.in
diff --git a/data/ibus-setup-libpinyin.desktop.in.in b/data/ibus-setup-libpinyin.desktop.in
index 481ba1b..481ba1b 100644
--- a/data/ibus-setup-libpinyin.desktop.in.in
+++ b/data/ibus-setup-libpinyin.desktop.in
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 <shawn.p.huang@gmail.com>
+# 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