GNOME.org
 

[yelp-xsl] common/l10n.xsl: Finally moving gettext to common

commit 34c23189a525d445d91901d318664acddbcb92fd
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Jan 18 10:20:55 2012 -0500

    common/l10n.xsl: Finally moving gettext to common

 .gitignore                                       |    3 +--
 configure.ac                                     |    3 +--
 doc/yelp-xsl/Makefile.am                         |    1 -
 xslt/Makefile.am                                 |    3 +--
 xslt/common/Makefile.am                          |   13 ++++++++-----
 xslt/{gettext => common}/domains/Makefile.am     |    2 +-
 xslt/{gettext => common}/domains/msgs.xsl        |    0
 xslt/{gettext => common}/domains/yelp-xsl.pot    |    0
 xslt/{gettext => common}/domains/yelp-xsl.xml.in |    0
 xslt/{gettext => common}/l10n-numbers.xsl        |    3 ---
 xslt/{gettext/gettext.xsl => common/l10n.xsl}    |    0
 xslt/docbook/html/db2xhtml.xsl                   |    2 +-
 xslt/gettext/.gitignore                          |    1 -
 xslt/gettext/Makefile.am                         |    9 ---------
 xslt/mallard/html/mal2xhtml.xsl                  |    2 +-
 yelp-xsl.pc.in                                   |    3 ++-
 16 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 84a83b1..220972a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,6 @@ yelp-xsl.pc
 /doc/yelp-xsl/C/dita2html-topic.page
 /doc/yelp-xsl/C/dita2html.page
 /doc/yelp-xsl/C/dita2xhtml.page
-/doc/yelp-xsl/C/gettext.page
 /doc/yelp-xsl/C/html.page
 /doc/yelp-xsl/C/icons.page
 /doc/yelp-xsl/C/l10n-numbers.page
@@ -84,5 +83,5 @@ yelp-xsl.pc
 /doc/yelp-xsl/C/mal2xhtml.page
 /doc/yelp-xsl/C/utils.page
 /xslt/theme/test-theme.html
-/xslt/gettext/domains/yelp-xsl.xml
+/xslt/common/domains/yelp-xsl.xml
 /test/testdocs/html
diff --git a/configure.ac b/configure.ac
index c83bc3e..d453c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,7 @@ doc/yelp-xsl/Makefile
 po/Makefile.in
 xslt/Makefile
 xslt/common/Makefile
+xslt/common/domains/Makefile
 xslt/docbook/Makefile
 xslt/docbook/common/Makefile
 xslt/docbook/html/Makefile
@@ -72,8 +73,6 @@ xslt/mallard/Makefile
 xslt/mallard/cache/Makefile
 xslt/mallard/common/Makefile
 xslt/mallard/html/Makefile
-xslt/gettext/Makefile
-xslt/gettext/domains/Makefile
 ])
 
 AC_OUTPUT
diff --git a/doc/yelp-xsl/Makefile.am b/doc/yelp-xsl/Makefile.am
index 1dccf1f..43283ed 100644
--- a/doc/yelp-xsl/Makefile.am
+++ b/doc/yelp-xsl/Makefile.am
@@ -2,7 +2,6 @@ ABS_SRCDIR = @abs_srcdir@
 
 xsldoc_dirs = 						\
 	$(ABS_SRCDIR)/../../xslt/common			\
-	$(ABS_SRCDIR)/../../xslt/gettext		\
 	$(ABS_SRCDIR)/../../xslt/docbook/common		\
 	$(ABS_SRCDIR)/../../xslt/docbook/html		\
 	$(ABS_SRCDIR)/../../xslt/docbook/omf		\
diff --git a/xslt/Makefile.am b/xslt/Makefile.am
index 4b918c1..8704f40 100644
--- a/xslt/Makefile.am
+++ b/xslt/Makefile.am
@@ -1,2 +1 @@
-# gettext needs to be first
-SUBDIRS = gettext docbook mallard common
+SUBDIRS = common docbook mallard
diff --git a/xslt/common/Makefile.am b/xslt/common/Makefile.am
index e3d3c8e..4b1d764 100644
--- a/xslt/common/Makefile.am
+++ b/xslt/common/Makefile.am
@@ -1,10 +1,13 @@
+SUBDIRS = domains
+
 xsldir=$(datadir)/yelp-xsl/xslt/common
 
-xsl_DATA =		\
-	color.xsl	\
-	icons.xsl	\
-	html.xsl	\
+xsl_DATA =			\
+	color.xsl		\
+	icons.xsl		\
+	l10n.xsl		\
+	l10n-numbers.xsl	\
+	html.xsl		\
 	utils.xsl
 
 EXTRA_DIST=$(xsl_DATA)
-
diff --git a/xslt/gettext/domains/Makefile.am b/xslt/common/domains/Makefile.am
similarity index 95%
rename from xslt/gettext/domains/Makefile.am
rename to xslt/common/domains/Makefile.am
index 79d5474..526c099 100644
--- a/xslt/gettext/domains/Makefile.am
+++ b/xslt/common/domains/Makefile.am
@@ -22,7 +22,7 @@ yelp-xsl.xml: yelp-xsl.xml.in
 	rmdir .yelp-xsl; \
 	rm .yelp-xsl.files
 
-xsldir=$(datadir)/yelp-xsl/xslt/gettext/domains
+xsldir=$(datadir)/yelp-xsl/xslt/common/domains
 
 xsl_DATA = yelp-xsl.xml
 
diff --git a/xslt/gettext/domains/msgs.xsl b/xslt/common/domains/msgs.xsl
similarity index 100%
rename from xslt/gettext/domains/msgs.xsl
rename to xslt/common/domains/msgs.xsl
diff --git a/xslt/gettext/domains/yelp-xsl.pot b/xslt/common/domains/yelp-xsl.pot
similarity index 100%
rename from xslt/gettext/domains/yelp-xsl.pot
rename to xslt/common/domains/yelp-xsl.pot
diff --git a/xslt/gettext/domains/yelp-xsl.xml.in b/xslt/common/domains/yelp-xsl.xml.in
similarity index 100%
rename from xslt/gettext/domains/yelp-xsl.xml.in
rename to xslt/common/domains/yelp-xsl.xml.in
diff --git a/xslt/gettext/l10n-numbers.xsl b/xslt/common/l10n-numbers.xsl
similarity index 99%
rename from xslt/gettext/l10n-numbers.xsl
rename to xslt/common/l10n-numbers.xsl
index 1905a7d..7dfce86 100644
--- a/xslt/gettext/l10n-numbers.xsl
+++ b/xslt/common/l10n-numbers.xsl
@@ -17,7 +17,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-                xmlns:msg="http://projects.gnome.org/yelp/gettext/";
                 xmlns:math="http://exslt.org/math";
                 exclude-result-prefixes="msg"
                 extension-element-prefixes="math"
@@ -27,8 +26,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 Localized Numbers
 -->
 
-<xsl:include href="gettext.xsl"/>
-
 
 <!--**==========================================================================
 l10n.number
diff --git a/xslt/gettext/gettext.xsl b/xslt/common/l10n.xsl
similarity index 100%
rename from xslt/gettext/gettext.xsl
rename to xslt/common/l10n.xsl
diff --git a/xslt/docbook/html/db2xhtml.xsl b/xslt/docbook/html/db2xhtml.xsl
index 3e5deca..4f92256 100644
--- a/xslt/docbook/html/db2xhtml.xsl
+++ b/xslt/docbook/html/db2xhtml.xsl
@@ -24,7 +24,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 DocBook to XHTML
 -->
 
-<xsl:import href="../../gettext/gettext.xsl"/>
+<xsl:import href="../../common/l10n.xsl"/>
 <xsl:import href="../../common/color.xsl"/>
 <xsl:import href="../../common/icons.xsl"/>
 <xsl:import href="../../common/html.xsl"/>
diff --git a/xslt/mallard/html/mal2xhtml.xsl b/xslt/mallard/html/mal2xhtml.xsl
index 5822022..e76be33 100644
--- a/xslt/mallard/html/mal2xhtml.xsl
+++ b/xslt/mallard/html/mal2xhtml.xsl
@@ -29,7 +29,7 @@ Mallard to XHTML
 REMARK: Describe this module
 -->
 
-<xsl:import href="../../gettext/gettext.xsl"/>
+<xsl:import href="../../common/l10n.xsl"/>
 <xsl:import href="../../common/color.xsl"/>
 <xsl:import href="../../common/icons.xsl"/>
 <xsl:import href="../../common/html.xsl"/>
diff --git a/yelp-xsl.pc.in b/yelp-xsl.pc.in
index 682ab2d..ba04803 100644
--- a/yelp-xsl.pc.in
+++ b/yelp-xsl.pc.in
@@ -4,7 +4,8 @@ datadir= datadir@
 icondir=${datadir}/yelp-xsl/icons
 jsdir=${datadir}/yelp-xsl/js
 xsltdir=${datadir}/yelp-xsl/xslt
-gettext=${xsltdir}/gettext/gettext.xsl
+gettext=${xsltdir}/common/l10n.xsl
+domains=${xsltdir}/common/domains/
 db2html=${xsltdir}/docbook/html/db2html.xsl
 db2xhtml=${xsltdir}/docbook/html/db2xhtml.xsl
 db2omf=${xsltdir}/docbook/omf/db2omf.xsl
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]