[yelp-xsl] Fixed inline quote formatter for new l10n system

[Shaun McCance <shaunm src gnome org>]

commit 168883ac2438ab6fad61a0e957f7aad9bcae80be
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Jun 18 12:24:07 2011 -0400

    Fixed inline quote formatter for new l10n system

 xslt/docbook/html/db2html-inline.xsl |    7 ++--
 xslt/gettext/domains/yelp-xsl.pot    |   42 ++++++++++++++++-----
 xslt/gettext/domains/yelp-xsl.xml.in |   66 +++++++++++----------------------
 3 files changed, 57 insertions(+), 58 deletions(-)
---
diff --git a/xslt/docbook/html/db2html-inline.xsl b/xslt/docbook/html/db2html-inline.xsl
index cdff675..194bada 100644
--- a/xslt/docbook/html/db2html-inline.xsl
+++ b/xslt/docbook/html/db2html-inline.xsl
@@ -963,14 +963,13 @@ FIXME
 <!-- = quote % db2html.inline.content.mode = -->
 <xsl:template mode="db2html.inline.content.mode" match="quote | db:quote">
   <xsl:call-template name="l10n.gettext">
-    <xsl:with-param name="msgid" select="'quote.format'"/>
-    <xsl:with-param name="role">
+    <xsl:with-param name="msgid">
       <xsl:choose>
         <xsl:when test="(count(ancestor::quote) mod 2) = 0">
-          <xsl:text>outer</xsl:text>
+          <xsl:text>quote.format</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>inner</xsl:text>
+          <xsl:text>quote.inner.format</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:with-param>
diff --git a/xslt/gettext/domains/yelp-xsl.pot b/xslt/gettext/domains/yelp-xsl.pot
index bb428da..9630376 100644
--- a/xslt/gettext/domains/yelp-xsl.pot
+++ b/xslt/gettext/domains/yelp-xsl.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-06-17 11:28-0400\n"
+"POT-Creation-Date: 2011-06-18 12:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -294,7 +294,7 @@ msgstr ""
 #. 
 #. <label/> - The term being defined by the glossary entry
 #. 
-#: yelp-xsl.xml.in:336(msg/msgstr)
+#: yelp-xsl.xml.in:335(msg/msgstr)
 msgid "View the bibliography entry <biblioentry.label/>."
 msgstr ""
 
@@ -316,7 +316,7 @@ msgstr ""
 #. 
 #. <biblioentry.label/> - The text content of the bibliography label
 #. 
-#: yelp-xsl.xml.in:359(msg/msgstr)
+#: yelp-xsl.xml.in:358(msg/msgstr)
 msgid "[<biblioentry.label/>]"
 msgstr ""
 
@@ -332,7 +332,7 @@ msgstr ""
 #. <citation/> - The text content of the citation element, possibly
 #.               as a link to an entry in the bibliography
 #. 
-#: yelp-xsl.xml.in:376(msg/msgstr)
+#: yelp-xsl.xml.in:375(msg/msgstr)
 msgid "[<citation.label/>]"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgstr ""
 #. <comment.name/> - The name of the person making the comment
 #. <comment.date/> - The date the comment was made
 #. 
-#: yelp-xsl.xml.in:405(msg/msgstr)
+#: yelp-xsl.xml.in:404(msg/msgstr)
 msgid "from <comment.name/> on <comment.date/>"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 #. 
 #. <comment.name/> - The name of the person making the comment
 #. 
-#: yelp-xsl.xml.in:433(msg/msgstr)
+#: yelp-xsl.xml.in:432(msg/msgstr)
 msgid "from <comment.name/>"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgstr ""
 #. 
 #. <string/> - The linked-to email address
 #. 
-#: yelp-xsl.xml.in:445(msg/msgstr)
+#: yelp-xsl.xml.in:444(msg/msgstr)
 msgid "Send email to â<string/>â."
 msgstr ""
 
@@ -409,7 +409,7 @@ msgstr ""
 #. 
 #. <glossterm/> - The term being defined by the glossary entry
 #. 
-#: yelp-xsl.xml.in:457(msg/msgstr)
+#: yelp-xsl.xml.in:456(msg/msgstr)
 msgid "Read the definition for â<glossterm/>â."
 msgstr ""
 
@@ -429,7 +429,7 @@ msgstr ""
 #. 
 #. <glosssee/> - The actual link or links of the cross reference
 #. 
-#: yelp-xsl.xml.in:478(msg/msgstr)
+#: yelp-xsl.xml.in:477(msg/msgstr)
 msgid "See <glosssee/>."
 msgstr ""
 
@@ -450,7 +450,29 @@ msgstr ""
 #. 
 #. <glosssee/> - The actual link or links of the cross reference
 #. 
-#: yelp-xsl.xml.in:500(msg/msgstr)
+#: yelp-xsl.xml.in:499(msg/msgstr)
 msgid "See also <glosssee/>."
 msgstr ""
 
+#. ID: quote.format
+#. This is a format message used to format inline quotations. Special
+#. elements in the message will be replaced with the appropriate content,
+#. as follows:
+#. 
+#. <node/> - The text content of the quote element
+#. 
+#: yelp-xsl.xml.in:511(msg/msgstr)
+msgid "â<node/>â"
+msgstr ""
+
+#. ID: quote.format
+#. This is a format message used to format inline quotations inside
+#. other inline quotations. Special elements in the message will be
+#. replaced with the appropriate content, as follows:
+#. 
+#. <node/> - The text content of the quote element
+#. 
+#: yelp-xsl.xml.in:523(msg/msgstr)
+msgid "â<node/>â"
+msgstr ""
+
diff --git a/xslt/gettext/domains/yelp-xsl.xml.in b/xslt/gettext/domains/yelp-xsl.xml.in
index 9c8d421..ef01a6d 100644
--- a/xslt/gettext/domains/yelp-xsl.xml.in
+++ b/xslt/gettext/domains/yelp-xsl.xml.in
@@ -321,7 +321,6 @@ double quotation mark for the watermark image.
 
 <!-- ======================================================================= -->
 
-<!-- FIXME: change msg:label, move to db-common -->
 <msg id="biblioentry.tooltip">
 <its:locNote>
 ID: biblioentry.tooltip
@@ -500,50 +499,29 @@ appropriate content, as follows:
 <msgstr>See also <glosssee/>.</msgstr>
 </msg>
 
-<!-- FIXME: split in two -->
-<msgset>
-  <msgstr>quote.format</msgstr>
-  <!-- 
-  This is a special format message.  Please read the full translator
-  documentation before translating this message.  The documentation
-  is maintained as part of the stylesheet documentation in DocBook.
-  For your convenience, it has also been converted to an HTML file
-  named STYLESHEETS.xml in the i18n directory.
-
-  quote - An inline quotation
-  http://docbook.org/tdg/en/html/quote.html
-
-  This is a format message used to format inline quotations.  This template
-  uses roles to control how the quotation is formatted.  The role indicates
-  whether this is an outer or inner quotation.  Quotations nested inside
-  another quotation are inner quotations.  Many languages have an alternate
-  notation for nested quotations.
-
-  These stylesheets only provide two levels of quotation formatting.  If
-  quote elements are nested deeper, the stylesheets will alternate between
-  the 'outer' and 'inner' roles.  If your language uses different formatting
-  for deeper quotations, please contact the maintainers, and we will try to
-  implement a more flexible formatting mechanism.
-
-  Special elements in the message will be replaced with the
-  appropriate content, as follows:
+<msg id="quote.format">
+<its:locNote>
+ID: quote.format
+This is a format message used to format inline quotations. Special
+elements in the message will be replaced with the appropriate content,
+as follows:
 
-  node - The text content of the quote element
+&lt;node/> - The text content of the quote element
+</its:locNote>
+<msgstr>â<node/>â</msgstr>
+</msg>
 
-  These should be written as empty XML elements.  Due to limitations
-  in intltool, I can't write XML content in translator comments.  To
-  insert the node, simply write left angle bracket, node, slash,
-  right angle bracket.
+<msg id="quote.inner.format">
+<its:locNote>
+ID: quote.format
+This is a format message used to format inline quotations inside
+other inline quotations. Special elements in the message will be
+replaced with the appropriate content, as follows:
 
-  Additionally, format messages can use the i, b, and tt markup tags
-  to mark text as italic, bold, and monospace.
-  -->
-  <_msg>
-    <msgstr>quote.format</msgstr>
-    <msgstr role='inner'>â<node/>â</msgstr>
-    <msgstr>â<node/>â</msgstr>
-  </_msg>
-</msgset>    
+&lt;node/> - The text content of the quote element
+</its:locNote>
+<msgstr>â<node/>â</msgstr>
+</msg>
 
 <!-- FIXME: probably ok, check -->
 <msgset>