Merge pull request #1977 from jimklimov/msgfmt

Use `msgfmt` to "compile" translations for NUT-Monitor (Python GUI app)

configure.ac

@@ -1558,6 +1558,12 @@ dnl installing these features or not.
 dnl Note: more for tests than other reasons, there is also an option
 dnl value to "force" the installation.
 
+dnl The gettext "msgfmt" tool (or equivalent) can be used to maintain
+dnl human-language text translations. Currently this is used specifically
+dnl in the Python NUT-Monitor app sources (*.po => *.mo conversions).
+AC_PATH_PROGS([MSGFMT], [msgfmt], [none])
+AM_CONDITIONAL([HAVE_MSGFMT], [test "x${MSGFMT}" != "xnone"])
+
 dnl ----------------------------------------------------------------------
 dnl checks related to --with-serial
 

docs/config-prereqs.txt

@@ -141,6 +141,15 @@ metadata about recently published package revisions:
 #   :; apt-get install python3 python3.9
 # You can find a list of what is (pre-)installed with:
 #   :; dpkg -l | grep -Ei 'perl|python'
+#
+# For localization maintenance (currently in Python NUT-Monitor app),
+# provide an `msgfmt` implementation, e.g.:
+#   :; apt-get install gettext
+#
+# To install the Python NUT-Monitor app, you may need some modules:
+#   :; apt-get install pip
+# For Python3:
+#   :; python3 -m pip install PyQt5 configparser
 
 # For spell-checking, highly recommended if you would propose pull requests:
 :; apt-get install \

docs/nut.dict

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3185 utf-8
+personal_ws-1.1 en 3189 utf-8
 AAS
 ABI
 ACFAIL
@@ -976,6 +976,7 @@ PwrOut
 PyGTK
 PyNUT
 PyNUTClient
+PyQt
 QBDR
 QBT
 QBV
@@ -1710,6 +1711,7 @@ compat
 compilerPath
 conf
 config
+configparser
 configs
 configurationProvider
 configureaz
@@ -1983,6 +1985,7 @@ getconf
 getent
 getenv
 getopt
+gettext
 getvar
 gitcache
 github
@@ -2358,6 +2361,7 @@ monuser
 morbo
 mozilla
 msec
+msgfmt
 msi
 msvcrt
 msys

scripts/python/Makefile.am

@@ -24,6 +24,10 @@ PYTHON3_SITE_PACKAGES = @PYTHON3_SITE_PACKAGES@
 
 BINDIR = @BINDIR@
 
+if HAVE_MSGFMT
+MSGFMT = @MSGFMT@
+endif HAVE_MSGFMT
+
 NUT_MONITOR_PY2GTK2 = \
 	app/ui/gui-1.3.glade \
 	app/nut-monitor-py2gtk2.desktop
@@ -71,7 +75,7 @@ PYNUT_COMMON = \
 	module/README
 
 # Note: we both distribute and install the generated *.mo translation files
-# so they are listed above and not in NUT_MONITOR_COMMON_GENERATED
+# so they are listed above and not in NUT_MONITOR_COMMON_TEMPLATE
 NUT_MONITOR_COMMON_TEMPLATE = \
 	app/locale/NUT-Monitor.pot \
 	app/locale/fr/fr.po \
@@ -113,6 +117,32 @@ nutmonitordir = $(nut_with_nut_monitor_dir)
 nobase_nutmonitor_DATA = $(NUT_MONITOR_DISPATCHER_NOEXEC) $(NUT_MONITOR_COMMON)
 nobase_nutmonitor_SCRIPTS = $(NUT_MONITOR_DISPATCHER_SCRIPT)
 
+if HAVE_MSGFMT
+# Note lack of "$<" below - it is a non-portable GNU Make extension
+# The POT-Creation-Date: is removed by current python gettext builder to avoid
+# "spurious" changes that do not benefit (otherwise unmodified) contents; see:
+#   https://github.com/sphinx-doc/sphinx/pull/3490
+#   https://github.com/sphinx-doc/sphinx/issues/3443
+# Note that OUTFILE may be in builddir (not necessarily same as srcdir)
+ACT_MSGFMT = { \
+	$(GREP) -v -E '^.?POT-Creation-Date: ' < "$${SRCFILE}" > "$${OUTFILE}.tmpsrc" && \
+	$(MSGFMT) -o "$${OUTFILE}" "$${OUTFILE}.tmpsrc" && \
+	rm -f "$${OUTFILE}.tmpsrc" ; \
+}
+
+app/locale/fr/LC_MESSAGES/NUT-Monitor.mo: app/locale/fr/fr.po
+	@$(MKDIR_P) "$(builddir)/app/locale/fr/LC_MESSAGES"
+	SRCFILE="$^"; OUTFILE="$@"; $(ACT_MSGFMT)
+
+app/locale/it/LC_MESSAGES/NUT-Monitor.mo: app/locale/it/it.po
+	@$(MKDIR_P) "$(builddir)/app/locale/it/LC_MESSAGES"
+	SRCFILE="$^"; OUTFILE="$@"; $(ACT_MSGFMT)
+
+app/locale/ru/LC_MESSAGES/NUT-Monitor.mo: app/locale/ru/ru.po
+	@$(MKDIR_P) "$(builddir)/app/locale/ru/LC_MESSAGES"
+	SRCFILE="$^"; OUTFILE="$@"; $(ACT_MSGFMT)
+endif HAVE_MSGFMT
+
 if WITH_NUT_MONITOR_PY2GTK2
 nobase_nutmonitor_DATA += $(NUT_MONITOR_PY2GTK2)
 nobase_nutmonitor_SCRIPTS += $(NUT_MONITOR_PY2GTK2_GENERATED_SCRIPT)

scripts/python/app/locale/fr/fr.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: NUT Monitor\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-14 22:47+0200\n"
 "PO-Revision-Date: 2013-10-14 22:50+0200\n"