Merge pull request #243 from inigomartinez/gettext

build: Migrate from Intltool to Gettext

Author: zdohnal

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS=po
+SUBDIRS=. po
 
 EXPORT_MODULES=					\
 	cupshelpers/__init__.py			\
@@ -228,14 +228,18 @@ nodist_dbusservices_DATA =				\
 	dbus/org.fedoraproject.Config.Printing.service
 dbusservicesdir = $(datadir)/dbus-1/services/
 
-@INTLTOOL_DESKTOP_RULE@
-
 desktop_DATA =\
 	system-config-printer.desktop \
 	print-applet.desktop
 desktopdir = $(datadir)/applications/
 autostartdir = $(sysconfdir)/xdg/autostart/
 
+system-config-printer.desktop: system-config-printer.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=X-GNOME-FullName --template $< -d $(top_srcdir)/po -o $@
+
+print-applet.desktop: print-applet.desktop.in
+	$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
 DESKTOP_VENDOR=@DESKTOPVENDOR@
 DESKTOP_PREFIX=@DESKTOPPREFIX@
 
@@ -263,12 +267,13 @@ uninstall-desktopDATA:
 
 desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
 
-@INTLTOOL_XML_RULE@
-
 appdatadir = $(datadir)/metainfo
 appdata_in_files = system-config-printer.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
+system-config-printer.appdata.xml: system-config-printer.appdata.xml.in
+	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 EXTRA_DIST=\
 	$(nobase_pkgdata_SCRIPTS) \
 	$(nobase_pkgdata_DATA) \
@@ -284,9 +289,6 @@ EXTRA_DIST=\
 	ChangeLog-OLD \
 	README \
 	$(desktop_in_files) \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
 	config.py.in \
 	cupshelpers/config.py.in \
 	profile-ppds.py \
@@ -320,8 +322,7 @@ update-po: missing-languages
 
 missing-languages:
 	bash -c '\
-	eval $$(grep ALL_LINGUAS configure.ac); \
-	diff -u <(echo $$ALL_LINGUAS | xargs -rn1 echo) \
+	diff -u <(cat po/LINGUAS) \
 		<(cd po; ls -1 *.po | sed -e "s,\.po$$,,")'
 
 missing-imports:
@@ -385,11 +386,11 @@ TESTS = test-xml-validity.sh py.test.sh
 
 CLEANFILES=			\
 	$(systemd_CLEANFILES)	\
+	$(desktop_DATA)		\
 	$(appdata_DATA)
 
 DISTCLEANFILES=*.pyc *.pyo *~ *.bak \
 	troubleshoot/*.pyc troubleshoot/*.pyo troubleshoot/*~ \
-	intltool-extract intltool-merge intltool-update \
 	*.desktop man/*.1 \
 	test-ppd-module.sh test-xml-validity.sh py.test.sh pickled-ppds \
 	config.py cupshelpers/config.py zanata.xml \

README.md

@@ -17,6 +17,7 @@ Build requirements:
   - systemd
 - tools:
   - autoconf
+  - autoconf-archives
   - automake
   - desktop-file-install
   - intltool

bootstrap

@@ -1,5 +1,5 @@
 #!/bin/sh
-intltoolize --force --copy
+autopoint --force
 aclocal
 automake --foreign --copy --add-missing
 autoconf

configure.ac

@@ -1,8 +1,8 @@
 AC_INIT(system-config-printer, 1.5.15)
 AC_CONFIG_SRCDIR(system-config-printer.py)
 AM_INIT_AUTOMAKE([dist-xz dist-bzip2 subdir-objects 1.6])
-IT_PROG_INTLTOOL
-AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_GNU_GETTEXT_VERSION(0.20)
+AX_REQUIRE_DEFINED([AM_GNU_GETTEXT])
 AM_GNU_GETTEXT([external])
 AM_PATH_PYTHON([3])
 PACKAGE="AC_PACKAGE_NAME"
@@ -80,7 +80,6 @@ AC_ARG_WITH(xmlto,
                 [Enable xmlto manual generation @<:@default=yes@:>@])])
 AM_CONDITIONAL([XMLTO], [test x$with_xmlto != xno])
 
-ALL_LINGUAS="ar as ast bg bn bn_IN br bs ca cs cy da de el en_GB es et fa fi fr fur gu he hi hr hu id is it ja kn ko lt lv mai ml mr ms nb nds nl nn oc or pa pl pt pt_BR ro ru si sk sl sr sr@latin sv ta te th tr uk vi zh_CN zh_TW"
 AC_CONFIG_FILES([
 Makefile
 po/Makefile.in

po/LINGUAS

@@ -0,0 +1,64 @@
+ar
+as
+ast
+bg
+bn
+bn_IN
+br
+bs
+ca
+cs
+cy
+da
+de
+el
+en_GB
+es
+et
+fa
+fi
+fr
+fur
+gu
+he
+hi
+hr
+hu
+id
+is
+it
+ja
+kn
+ko
+lt
+lv
+mai
+ml
+mr
+ms
+nb
+nds
+nl
+nn
+oc
+or
+pa
+pl
+pt
+pt_BR
+ro
+ru
+si
+sk
+sl
+sr
+sr@latin
+sv
+ta
+te
+th
+tr
+uk
+vi
+zh_CN
+zh_TW

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 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --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
@@ -39,3 +39,15 @@ MSGID_BUGS_ADDRESS = https://bugzilla.redhat.com/bugzilla
 # 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 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

po/POTFILES.in

@@ -1,6 +1,7 @@
 # List of source files which contain translatable strings.
-[encoding: UTF-8]
+# Please keep this file sorted alphabetically.
 
+applet.py
 asyncipp.py
 authconn.py
 errordialogs.py
@@ -10,29 +11,17 @@ options.py
 optionwidgets.py
 ppdippstr.py
 ppdsloader.py
+print-applet.desktop.in
 printerproperties.py
 probe_printer.py
 pysmb.py
 serversettings.py
-system-config-printer.py
-[type: gettext/glade] ui/AboutDialog.ui
-[type: gettext/glade] ui/ConnectDialog.ui
-[type: gettext/glade] ui/ConnectingDialog.ui
-[type: gettext/glade] ui/InstallDialog.ui
-[type: gettext/glade] ui/JobsWindow.ui
-[type: gettext/glade] ui/NewPrinterName.ui
-[type: gettext/glade] ui/NewPrinterWindow.ui
-[type: gettext/glade] ui/PrinterPropertiesDialog.ui
-[type: gettext/glade] ui/PrintersWindow.ui
-[type: gettext/glade] ui/ServerSettingsDialog.ui
-[type: gettext/glade] ui/SMBBrowseDialog.ui
-[type: gettext/glade] ui/statusicon_popupmenu.ui
-[type: gettext/glade] ui/WaitWindow.ui
-system-config-printer.desktop.in
 statereason.py
+system-config-printer.appdata.xml.in
+system-config-printer.desktop.in
+system-config-printer.py
 timedops.py
 ToolbarSearchEntry.py
-troubleshoot/__init__.py
 troubleshoot/base.py
 troubleshoot/CheckLocalServerPublishing.py
 troubleshoot/CheckNetworkServerSanity.py
@@ -44,6 +33,7 @@ troubleshoot/DeviceListed.py
 troubleshoot/ErrorLogCheckpoint.py
 troubleshoot/ErrorLogFetch.py
 troubleshoot/ErrorLogParse.py
+troubleshoot/__init__.py
 troubleshoot/Locale.py
 troubleshoot/LocalOrRemote.py
 troubleshoot/NetworkCUPSPrinterShared.py
@@ -56,6 +46,16 @@ troubleshoot/SchedulerNotRunning.py
 troubleshoot/ServerFirewalled.py
 troubleshoot/Shrug.py
 troubleshoot/Welcome.py
-applet.py
-print-applet.desktop.in
-system-config-printer.appdata.xml.in
+ui/AboutDialog.ui
+ui/ConnectDialog.ui
+ui/ConnectingDialog.ui
+ui/InstallDialog.ui
+ui/JobsWindow.ui
+ui/NewPrinterName.ui
+ui/NewPrinterWindow.ui
+ui/PrinterPropertiesDialog.ui
+ui/PrintersWindow.ui
+ui/ServerSettingsDialog.ui
+ui/SMBBrowseDialog.ui
+ui/statusicon_popupmenu.ui
+ui/WaitWindow.ui

print-applet.desktop.in

@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Print Queue Applet
-_Comment=System tray icon for managing print jobs
+Name=Print Queue Applet
+Comment=System tray icon for managing print jobs
 Exec=system-config-printer-applet
 Terminal=false
 Type=Application

system-config-printer.desktop.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
-_Name=Print Settings
-_GenericName=Print Settings
-_X-GNOME-FullName=Print Settings
-_Comment=Configure printers
+Name=Print Settings
+GenericName=Print Settings
+X-GNOME-FullName=Print Settings
+Comment=Configure printers
 Exec=system-config-printer
 Terminal=false
 Type=Application