Added textdomain in default.xml

6 files changed, 30 insertions, 48 deletions

diff --git a/engine/python2/Makefile.am b/engine/python2/Makefile.am
index a96f831..afc9236 100644
--- a/engine/python2/Makefile.am
+++ b/engine/python2/Makefile.am
@@ -3,8 +3,8 @@
 # ibus-anthy - The Anthy engine for IBus
 #
 # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -77,21 +77,11 @@ componentdir = $(datadir)/ibus/component
 engine_DATA = default.xml
 enginedir = $(pkgdatadir)/engine
 
-anthy.xml: anthy.xml.in
-	( \
-		libexecdir=${libexecdir}; \
-		pkgdatadir=${pkgdatadir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
-
-default.xml: default.xml.in
-	( \
-		libexecdir=${libexecdir}; \
-		pkgdatadir=${pkgdatadir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+%.xml: %.xml.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|g" \
+	    -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \
+	    -e "s|_description|description|g" \
+	$< > $@
 
 _config.py: _config.py.in
 	( \
diff --git a/engine/python2/anthy.xml.in.in b/engine/python2/anthy.xml.in.in
index 9a93744..66212cb 100644
--- a/engine/python2/anthy.xml.in.in
+++ b/engine/python2/anthy.xml.in.in
@@ -1,10 +1,10 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: anthy.xml -->
 <component>
 	<name>org.freedesktop.IBus.Anthy</name>
 	<description>Anthy Component</description>
-	<exec>${libexecdir}/ibus-engine-anthy --ibus</exec>
-	<version>@VERSION@</version>
+	<exec>@libexecdir@/ibus-engine-anthy --ibus</exec>
+	<version>@PACKAGE_VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
 	<homepage>http://code.google.com/p/ibus</homepage>
@@ -13,7 +13,7 @@
 	<!-- for engines -->
 	<observed-paths>
 		<path>~/.config/ibus-anthy/engines.xml</path>
-		<path>${pkgdatadir}/engine/default.xml</path>
+		<path>@pkgdatadir@/engine/default.xml</path>
 	</observed-paths>
-	<engines exec=\"${libexecdir}/ibus-engine-anthy --xml\" />
+	<engines exec="@libexecdir@/ibus-engine-anthy --xml" />
 </component>
diff --git a/engine/python2/default.xml.in.in b/engine/python2/default.xml.in.in
index 27e3c82..3ae5a62 100644
--- a/engine/python2/default.xml.in.in
+++ b/engine/python2/default.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <engines>
 	<engine>
 		<name>anthy</name>
@@ -10,10 +10,11 @@
 		<layout_variant></layout_variant>
 		<layout_option></layout_option>
 		<longname>Anthy</longname>
-		<description>Anthy Input Method</description>
+		<_description>Anthy Input Method</_description>
 		<rank>99</rank>
 		@HOTKEYS_XML@
 		@SYMBOL_XML@
 		<version>@PACKAGE_VERSION@</version>
+		<textdomain>ibus-anthy</textdomain>
 	</engine>
 </engines>
diff --git a/engine/python3/Makefile.am b/engine/python3/Makefile.am
index a96f831..afc9236 100644
--- a/engine/python3/Makefile.am
+++ b/engine/python3/Makefile.am
@@ -3,8 +3,8 @@
 # ibus-anthy - The Anthy engine for IBus
 #
 # Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
-# Copyright (c) 2010-2013 Takao Fujiwara <takao.fujiwara1@gmail.com>
-# Copyright (c) 2007-2013 Red Hat, Inc.
+# Copyright (c) 2010-2015 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2007-2015 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -77,21 +77,11 @@ componentdir = $(datadir)/ibus/component
 engine_DATA = default.xml
 enginedir = $(pkgdatadir)/engine
 
-anthy.xml: anthy.xml.in
-	( \
-		libexecdir=${libexecdir}; \
-		pkgdatadir=${pkgdatadir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
-
-default.xml: default.xml.in
-	( \
-		libexecdir=${libexecdir}; \
-		pkgdatadir=${pkgdatadir}; \
-		s=`cat $<`; \
-		eval "echo \"$${s}\""; \
-	) > $@
+%.xml: %.xml.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|g" \
+	    -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \
+	    -e "s|_description|description|g" \
+	$< > $@
 
 _config.py: _config.py.in
 	( \
diff --git a/engine/python3/anthy.xml.in.in b/engine/python3/anthy.xml.in.in
index 9a93744..66212cb 100644
--- a/engine/python3/anthy.xml.in.in
+++ b/engine/python3/anthy.xml.in.in
@@ -1,10 +1,10 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- filename: anthy.xml -->
 <component>
 	<name>org.freedesktop.IBus.Anthy</name>
 	<description>Anthy Component</description>
-	<exec>${libexecdir}/ibus-engine-anthy --ibus</exec>
-	<version>@VERSION@</version>
+	<exec>@libexecdir@/ibus-engine-anthy --ibus</exec>
+	<version>@PACKAGE_VERSION@</version>
 	<author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
 	<license>GPL</license>
 	<homepage>http://code.google.com/p/ibus</homepage>
@@ -13,7 +13,7 @@
 	<!-- for engines -->
 	<observed-paths>
 		<path>~/.config/ibus-anthy/engines.xml</path>
-		<path>${pkgdatadir}/engine/default.xml</path>
+		<path>@pkgdatadir@/engine/default.xml</path>
 	</observed-paths>
-	<engines exec=\"${libexecdir}/ibus-engine-anthy --xml\" />
+	<engines exec="@libexecdir@/ibus-engine-anthy --xml" />
 </component>
diff --git a/engine/python3/default.xml.in.in b/engine/python3/default.xml.in.in
index 27e3c82..3ae5a62 100644
--- a/engine/python3/default.xml.in.in
+++ b/engine/python3/default.xml.in.in
@@ -1,4 +1,4 @@
-<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<?xml version="1.0" encoding="utf-8"?>
 <engines>
 	<engine>
 		<name>anthy</name>
@@ -10,10 +10,11 @@
 		<layout_variant></layout_variant>
 		<layout_option></layout_option>
 		<longname>Anthy</longname>
-		<description>Anthy Input Method</description>
+		<_description>Anthy Input Method</_description>
 		<rank>99</rank>
 		@HOTKEYS_XML@
 		@SYMBOL_XML@
 		<version>@PACKAGE_VERSION@</version>
+		<textdomain>ibus-anthy</textdomain>
 	</engine>
 </engines>