polkit: Make the polkit policy files translatable.

7 files changed, 29 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 5acfcbc0..ea11ec5f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 5.50
 NAME = rpmdrake
 
-DIRS = po data mime
+DIRS = po polkit/policy data mime
 
 PREFIX = /usr/local
 DATADIR = $(PREFIX)/share
@@ -22,11 +22,10 @@ install: $(ALL)
 	find -name '*.pm' -o -name rpmdrake -o -name MageiaUpdate | xargs ./simplify-drakx-modules
 	./simplify-drakx-modules {gurpmi.addmedia,edit-urpm-sources.pl}
 	@for n in $(DIRS); do make -C $$n install; done
-	install -d $(BINDIR) $(SBINDIR) $(LIBEXECDIR) $(PREFIX)/share/polkit-1/actions
+	install -d $(BINDIR) $(SBINDIR) $(LIBEXECDIR)
 	install rpmdrake MageiaUpdate gurpmi.addmedia $(LIBEXECDIR)
 	install edit-urpm-sources.pl $(LIBEXECDIR)/drakrpm-edit-media
 	install polkit/wrappers/* $(BINDIR)
-	install polkit/policy/* $(PREFIX)/share/polkit-1/actions
 	ln -sf drakrpm-edit-media $(BINDIR)/edit-urpm-sources.pl
 	ln -sf rpmdrake $(BINDIR)/drakrpm
 	ln -sf MageiaUpdate $(BINDIR)/drakrpm-update
@@ -53,7 +52,8 @@ gui.lst:
 	 | sort -u > gui.lst
 
 check:
-	rm -f po/*.pot 
+	rm -f po/*.pot
+	@make -C po clean
 	@make -C po rpmdrake.pot
 
 .PHONY: gui.lst
diff --git a/po/Makefile b/po/Makefile
index b88aebff..db4e5d7e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -40,7 +40,7 @@ install:
 	done
 
 POTFILES.in:
-	(cd .. ; /bin/ls -1 data/*.desktop.in mime/*.desktop.in; ) > POTFILES.in
+	(cd .. ; /bin/ls -1 data/*.desktop.in mime/*.desktop.in polkit/policy/*.policy.in; ) > POTFILES.in
 clean:
 	@rm -rf *.mo *.pof *.pog $(POFILES:%=%t) $(PL_CFILES) non-perl.pot $(PGOAL)_tmp.pot
 
diff --git a/polkit/policy/Makefile b/polkit/policy/Makefile
new file mode 100644
index 00000000..1de72221
--- /dev/null
+++ b/polkit/policy/Makefile
@@ -0,0 +1,16 @@
+POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions
+
+POLICY_IN := $(wildcard *.policy.in)
+POLICY = $(POLICY_IN:.policy.in=.policy)
+
+all: $(POLICY)
+
+clean:
+	rm -f $(POLICY)
+
+install: all
+	install -d $(POLKITPOLICYDEST)
+	install -m644 $(POLICY) $(POLKITPOLICYDEST)
+
+%.policy:   %.policy.in
+	intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache
diff --git a/polkit/policy/org.mageia.rpmdrake-addmedia.policy b/polkit/policy/org.mageia.rpmdrake-addmedia.policy.in
index 4f4435f5..d4a58362 100644
--- a/polkit/policy/org.mageia.rpmdrake-addmedia.policy
+++ b/polkit/policy/org.mageia.rpmdrake-addmedia.policy.in
@@ -8,8 +8,8 @@
  <vendor_url>http://www.mageia.org/</vendor_url>
 
  <action id="org.mageia.rpmdrake-addmedia.pkexec.run">
-    <description>Run Mageia Package Media Adder</description>
-    <message>Authentication is required to run Mageia Package Media Adder</message>
+    <_description>Run Mageia Package Media Adder</_description>
+    <_message>Authentication is required to run Mageia Package Media Adder</_message>
     <icon_name>rpmdrake</icon_name>
     <defaults>
      <allow_any>no</allow_any>
diff --git a/polkit/policy/org.mageia.rpmdrake-editmedia.policy b/polkit/policy/org.mageia.rpmdrake-editmedia.policy.in
index d5a56cd4..d250ca73 100644
--- a/polkit/policy/org.mageia.rpmdrake-editmedia.policy
+++ b/polkit/policy/org.mageia.rpmdrake-editmedia.policy.in
@@ -8,8 +8,8 @@
  <vendor_url>http://www.mageia.org/</vendor_url>
 
  <action id="org.mageia.rpmdrake-editmedia.pkexec.run">
-    <description>Run Mageia Package Media Editor</description>
-    <message>Authentication is required to run Mageia Package Media Editor</message>
+    <_description>Run Mageia Package Media Editor</_description>
+    <_message>Authentication is required to run Mageia Package Media Editor</_message>
     <icon_name>rpmdrake</icon_name>
     <defaults>
      <allow_any>no</allow_any>
diff --git a/polkit/policy/org.mageia.rpmdrake-update.policy b/polkit/policy/org.mageia.rpmdrake-update.policy.in
index c9437bfb..ac7bf615 100644
--- a/polkit/policy/org.mageia.rpmdrake-update.policy
+++ b/polkit/policy/org.mageia.rpmdrake-update.policy.in
@@ -8,8 +8,8 @@
  <vendor_url>http://www.mageia.org/</vendor_url>
 
  <action id="org.mageia.rpmdrake-update.pkexec.run">
-    <description>Run Mageia Updater</description>
-    <message>Authentication is required to run Mageia Updater</message>
+    <_description>Run Mageia Updater</_description>
+    <_message>Authentication is required to run Mageia Updater</_message>
     <icon_name>rpmdrake</icon_name>
     <defaults>
      <allow_any>no</allow_any>
diff --git a/polkit/policy/org.mageia.rpmdrake.policy b/polkit/policy/org.mageia.rpmdrake.policy.in
index 5b7b3ee8..bdc43360 100644
--- a/polkit/policy/org.mageia.rpmdrake.policy
+++ b/polkit/policy/org.mageia.rpmdrake.policy.in
@@ -8,8 +8,8 @@
  <vendor_url>http://www.mageia.org/</vendor_url>
 
  <action id="org.mageia.rpmdrake.pkexec.run">
-    <description>Run Mageia Package Manager</description>
-    <message>Authentication is required to run Mageia Package Manager</message>
+    <_description>Run Mageia Package Manager</_description>
+    <_message>Authentication is required to run Mageia Package Manager</_message>
     <icon_name>rpmdrake</icon_name>
     <defaults>
      <allow_any>no</allow_any>