build-sys: Add i18n support through intltool

And put the PolicyKit policy files up for translation.

diff --git a/Makefile.am b/Makefile.am
index 5cb4d29463b428b900180e84b9056b8a000ab132..4acdb2e7fb901d15498ed8b8478cf30f4d4fb361 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -470,11 +472,14 @@ pkgconfigdata_DATA = \
 nodist_polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
-dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy \
-        src/org.freedesktop.locale1.policy \
-        src/org.freedesktop.timedate1.policy \
-        src/org.freedesktop.login1.policy
+dist_polkitpolicy_in_files = \
+        src/org.freedesktop.hostname1.policy.in \
+        src/org.freedesktop.locale1.policy.in \
+        src/org.freedesktop.timedate1.policy.in \
+        src/org.freedesktop.login1.policy.in
+
+@INTLTOOL_POLICY_RULE@
+polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
@@ -1356,6 +1361,7 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
+       $(polkitpolicy_DATA) \
        src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC

diff --git a/autogen.sh b/autogen.sh
index 826d9b0d0e1a423dd91d616f5b0de37bd51d7cd5..55a115d4e3b3d3fa814301908dc11855cbc6ca0f 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -60,6 +60,7 @@ else
     rm -f config.cache
 
     libtoolize -c --force
+    intltoolize -c -f
     run_versioned aclocal "$AM_VERSION" -I m4
     run_versioned autoconf "$AC_VERSION" -Wall
     run_versioned autoheader "$AC_VERSION"

diff --git a/configure.ac b/configure.ac
index 58296b9cf0382351878aa2c5010cb8b35b49fc73..bc7ab429e71643d2d67ba54abe441d588150dc9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,15 @@ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
         ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 ])
 
+# i18n stuff for the PolicyKit policy files
+IT_PROG_INTLTOOL([0.40.0])
+
+GETTEXT_PACKAGE=systemd
+AC_SUBST(GETTEXT_PACKAGE)
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.1])
+
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
 AC_PROG_SED
@@ -523,7 +532,7 @@ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 AC_SUBST([pamlibdir], [$with_pamlibdir])
 AC_SUBST([rootdir], [$with_rootdir])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile po/Makefile.in])
 AC_OUTPUT
 
 echo "

diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644 (file)
index 0000000..29be44e
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,4 @@
+src/org.freedesktop.hostname1.policy.in
+src/org.freedesktop.locale1.policy.in
+src/org.freedesktop.login1.policy.in
+src/org.freedesktop.timedate1.policy.in

diff --git a/src/org.freedesktop.hostname1.policy b/src/org.freedesktop.hostname1.policy.in
similarity index 76%
rename from src/org.freedesktop.hostname1.policy
rename to src/org.freedesktop.hostname1.policy.in
index 0ad64d9ee142609ee9a5a19515a51802373c2ba4..7d56b22c28ade07f6b22522b764af67e2cac0f01 100644 (file)
--- a/src/org.freedesktop.hostname1.policy
+++ b/src/org.freedesktop.hostname1.policy.in
@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.hostname1.set-hostname">
-                <description>Set host name</description>
-                <message>Authentication is required to set the local host name.</message>
+                <_description>Set host name</_description>
+                <_message>Authentication is required to set the local host name.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -27,8 +27,8 @@
         </action>
 
         <action id="org.freedesktop.hostname1.set-static-hostname">
-                <description>Set static host name</description>
-                <message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</message>
+                <_description>Set static host name</_description>
+                <_message>Authentication is required to set the statically configured local host name, as well as the pretty host name.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -37,8 +37,8 @@
         </action>
 
         <action id="org.freedesktop.hostname1.set-machine-info">
-                <description>Set machine information</description>
-                <message>Authentication is required to set local machine information.</message>
+                <_description>Set machine information</_description>
+                <_message>Authentication is required to set local machine information.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>

diff --git a/src/org.freedesktop.locale1.policy b/src/org.freedesktop.locale1.policy.in
similarity index 86%
rename from src/org.freedesktop.locale1.policy
rename to src/org.freedesktop.locale1.policy.in
index 6c755fd6b77273f42891fde238b52411e76d3bc4..186d7d34c5c32376b8609e742b00c293f0a7f0ce 100644 (file)
--- a/src/org.freedesktop.locale1.policy
+++ b/src/org.freedesktop.locale1.policy.in
@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.locale1.set-locale">
-                <description>Set system locale</description>
-                <message>Authentication is required to set the system locale.</message>
+                <_description>Set system locale</_description>
+                <_message>Authentication is required to set the system locale.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>

diff --git a/src/org.freedesktop.login1.policy b/src/org.freedesktop.login1.policy.in
similarity index 74%
rename from src/org.freedesktop.login1.policy
rename to src/org.freedesktop.login1.policy.in
index 7ad8f6f316b851d3860338a15c5ff4485b6c15a1..9482c87f1f79c0678e7204ca161414906a0558e0 100644 (file)
--- a/src/org.freedesktop.login1.policy
+++ b/src/org.freedesktop.login1.policy.in
@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.login1.set-user-linger">
-                <description>Allow non-logged-in users to run programs</description>
-                <message>Authentication is required to allow a non-logged-in user to run programs</message>
+                <_description>Allow non-logged-in users to run programs</_description>
+                <_message>Authentication is required to allow a non-logged-in user to run programs</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -27,8 +27,8 @@
         </action>
 
         <action id="org.freedesktop.login1.attach-device">
-                <description>Allow attaching devices to seats</description>
-                <message>Authentication is required to allow attaching a device to a seat</message>
+                <_description>Allow attaching devices to seats</_description>
+                <_message>Authentication is required to allow attaching a device to a seat</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -37,8 +37,8 @@
         </action>
 
         <action id="org.freedesktop.login1.flush-devices">
-                <description>Flush device to seat attachments</description>
-                <message>Authentication is required to allow reseting how devices are attached to seats</message>
+                <_description>Flush device to seat attachments</_description>
+                <_message>Authentication is required to allow reseting how devices are attached to seats</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>

diff --git a/src/org.freedesktop.timedate1.policy b/src/org.freedesktop.timedate1.policy.in
similarity index 76%
rename from src/org.freedesktop.timedate1.policy
rename to src/org.freedesktop.timedate1.policy.in
index 5010efd6c5fa0926bc8a9b3eb53d8539d4084e61..f73e1aa7e07854aa306323993564c95f8782e6d5 100644 (file)
--- a/src/org.freedesktop.timedate1.policy
+++ b/src/org.freedesktop.timedate1.policy.in
@@ -17,8 +17,8 @@
         <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
 
         <action id="org.freedesktop.timedate1.set-time">
-                <description>Set system time</description>
-                <message>Authentication is required to set the system time.</message>
+                <_description>Set system time</_description>
+                <_message>Authentication is required to set the system time.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -27,8 +27,8 @@
         </action>
 
         <action id="org.freedesktop.timedate1.set-timezone">
-                <description>Set system timezone</description>
-                <message>Authentication is required to set the system timezone.</message>
+                <_description>Set system timezone</_description>
+                <_message>Authentication is required to set the system timezone.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>
@@ -37,9 +37,9 @@
         </action>
 
         <action id="org.freedesktop.timedate1.set-local-rtc">
-                <description>Set RTC to local timezone or UTC</description>
-                <message>Authentication is required to control whether
-                the RTC stores the local or UTC time.</message>
+                <_description>Set RTC to local timezone or UTC</_description>
+                <_message>Authentication is required to control whether
+                the RTC stores the local or UTC time.</_message>
                 <defaults>
                         <allow_any>auth_admin_keep</allow_any>
                         <allow_inactive>auth_admin_keep</allow_inactive>