Commit 2d204c8c11956d8d871e511623fc93dc83c43d39

Authored by Colomban Wendling
1 parent dd95c025
Exists in version_1_0_1

Fix translation setup

autogen.sh
... ... @@ -24,6 +24,7 @@ fi
24 24  
25 25 set -x
26 26 aclocal --install || exit 1
  27 +intltoolize --force --copy --automake || exit 1
27 28 autoreconf --verbose --force --install -Wno-portability || exit 1
28 29 { set +x; } 2>/dev/null
29 30  
... ...
configure.ac
... ... @@ -71,8 +71,8 @@ dnl **************************************************************************
71 71 dnl Internationalization
72 72 dnl **************************************************************************
73 73  
74   -AM_GNU_GETTEXT([external])
75   -AM_GNU_GETTEXT_VERSION([0.19])
  74 +IT_PROG_INTLTOOL([0.40.0])
  75 +AM_GLIB_GNU_GETTEXT
76 76  
77 77 GETTEXT_PACKAGE=mate-status-notifier-applet
78 78 AC_SUBST([GETTEXT_PACKAGE])
... ...
data/Makefile.am
... ... @@ -13,8 +13,7 @@ applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
13 13 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
14 14 $< > $@
15 15  
16   -#~ %.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
17   -%.mate-panel-applet: %.mate-panel-applet.in ; $(AM_V_GEN) LC_ALL=C sed 's/^_//' < $< > $@
  16 +%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
18 17  
19 18  
20 19 ##############################
... ...
po/POTFILES.in
1 1 # List of source files containing translatable strings.
2 2 # Please keep this file sorted alphabetically.
3 3 status-notifier/sn-applet.c
  4 +[type: gettext/ini]data/org.mate.panel.applet.StatusNotifierAppletFactory.mate-panel-applet.in.in
... ...