[yelp-xsl] gettext: Fixed for l10n of biblioentry, citations, comments

From: Shaun McCance <shaunm src gnome org>
To: commits-list gnome org
Cc:
Subject: [yelp-xsl] gettext: Fixed for l10n of biblioentry, citations, comments
Date: Fri, 10 Jun 2011 19:42:00 +0000 (UTC)
commit d49b82bf408b787727879c5f1bad3b3a64217cab
Author: Shaun McCance <shaunm gnome org>
Date:   Fri Jun 10 15:45:46 2011 -0400

    gettext: Fixed for l10n of biblioentry, citations, comments

 xslt/docbook/html/db2html-bibliography.xsl |    2 +-
 xslt/docbook/html/db2html-inline.xsl       |    4 +-
 xslt/gettext/domains/yelp-xsl.pot          |   77 +++++++++++--
 xslt/gettext/domains/yelp-xsl.xml.in       |  170 +++++++++++-----------------
 xslt/mallard/html/mal2html-block.xsl       |    4 +-
 5 files changed, 136 insertions(+), 121 deletions(-)
---
diff --git a/xslt/docbook/html/db2html-bibliography.xsl b/xslt/docbook/html/db2html-bibliography.xsl
index cee25dd..84a6060 100644
--- a/xslt/docbook/html/db2html-bibliography.xsl
+++ b/xslt/docbook/html/db2html-bibliography.xsl
@@ -52,7 +52,7 @@ use the #{xreflabel} or #{id} attribute.
                 $node/*[1]/self::db:abbrev or $node/@xml:id">
     <span class="biblioentry.label">
       <xsl:call-template name="l10n.gettext">
-        <xsl:with-param name="msgid" select="'biblioentry.label.format'"/>
+        <xsl:with-param name="msgid" select="'biblioentry.label'"/>
         <xsl:with-param name="node" select="."/>
         <xsl:with-param name="format" select="true()"/>
       </xsl:call-template>
diff --git a/xslt/docbook/html/db2html-inline.xsl b/xslt/docbook/html/db2html-inline.xsl
index 7a3f373..cdff675 100644
--- a/xslt/docbook/html/db2html-inline.xsl
+++ b/xslt/docbook/html/db2html-inline.xsl
@@ -214,14 +214,14 @@ FIXME
 <!-- = citation % db2html.inline.content.mode = -->
 <xsl:template mode="db2html.inline.content.mode" match="citation | db:citation">
   <xsl:call-template name="l10n.gettext">
-    <xsl:with-param name="msgid" select="'citation.format'"/>
+    <xsl:with-param name="msgid" select="'citation.label'"/>
     <xsl:with-param name="node" select="."/>
     <xsl:with-param name="format" select="true()"/>
   </xsl:call-template>
 </xsl:template>
 
 <!-- = citation % l10n.format.mode = -->
-<xsl:template mode="l10n.format.mode" match="msg:citation">
+<xsl:template mode="l10n.format.mode" match="msg:citation.label">
   <xsl:param name="node"/>
   <xsl:for-each select="$node[1]">
     <xsl:variable name="entry_abbrev" select="key('bibkey-abbrev', string($node))"/>
diff --git a/xslt/gettext/domains/yelp-xsl.pot b/xslt/gettext/domains/yelp-xsl.pot
index 2cb8f14..04913ae 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-05-30 17:07-0400\n"
+"POT-Creation-Date: 2011-06-10 15:29-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"
@@ -260,10 +260,10 @@ msgstr ""
 #. <label/> - The term being defined by the glossary entry
 #. 
 #: yelp-xsl.xml.in:301(msg/msgstr)
-msgid "View the bibliography entry <label/>."
+msgid "View the bibliography entry <biblioentry.label/>."
 msgstr ""
 
-#. ID: biblioentry.label.format
+#. ID: biblioentry.label
 #. This is a format message used to format the labels for entries in
 #. a bibliography.  The content of the label is often an abbreviation
 #. of the authors' names and the year of publication.  In English,
@@ -281,11 +281,11 @@ msgstr ""
 #. 
 #. <biblioentry.label/> - The text content of the bibliography label
 #. 
-#: yelp-xsl.xml.in:421(msg/msgstr)
+#: yelp-xsl.xml.in:324(msg/msgstr)
 msgid "[<biblioentry.label/>]"
 msgstr ""
 
-#. ID: citation.format
+#. ID: citation.label
 #. This is a format message used to format inline citations to other
 #. published works.  The content is typically an abbreviation of the
 #. authors' last names.  In English, this abbreviation is usually
@@ -297,8 +297,63 @@ msgstr ""
 #. <citation/> - The text content of the citation element, possibly
 #.               as a link to an entry in the bibliography
 #. 
-#: yelp-xsl.xml.in:438(msg/msgstr)
-msgid "[<citation/>]"
+#: yelp-xsl.xml.in:341(msg/msgstr)
+msgid "[<citation.label/>]"
+msgstr ""
+
+#. ID: comment.name-date
+#. This is a format message used to format the citation of a comment
+#. made by an editor of a document. This appears on a new line after
+#. the title of the comment, if a title is present, or as the first
+#. line if a title is not present.
+#. 
+#. This string is used when both the name and the date are supplied.
+#. In English, a title together with this format string might produce
+#. something like this:
+#. 
+#.   Some Comment Title
+#.   from Shaun McCance on 2010-06-03
+#. 
+#.   Here is the text of the comment.
+#. 
+#. If only a name is supplied, and no date, then comment.name is used
+#. instead of this string.
+#. 
+#. Special elements in the message will be replaced with the
+#. appropriate content, as follows:
+#. 
+#. <comment.name/> - The name of the person making the comment
+#. <comment.date/> - The date the comment was made
+#. 
+#: yelp-xsl.xml.in:370(msg/msgstr)
+msgid "from <comment.name/> on <comment.date/>"
+msgstr ""
+
+#. ID: comment.name
+#. This is a format message used to format the citation of a comment
+#. made by an editor of a document. This appears on a new line after
+#. the title of the comment, if a title is present, or as the first
+#. line if a title is not present.
+#. 
+#. This string is used when only the name of the commenter is supplied.
+#. In English, a title together with this format string might produce
+#. something like this:
+#. 
+#.   Some Comment Title
+#.   from Shaun McCance
+#. 
+#.   Here is the text of the comment.
+#. 
+#. If a date is also supplied, then comment.name-date is used instead
+#. of this string.
+#. 
+#. Special elements in the message will be replaced with the
+#. appropriate content, as follows:
+#. 
+#. <comment.name/> - The name of the person making the comment
+#. 
+#: yelp-xsl.xml.in:398(msg/msgstr)
+msgid "from <comment.name/>"
 msgstr ""
 
 #. ID: email.tooltip
@@ -308,7 +363,7 @@ msgstr ""
 #. 
 #. <string/> - The linked-to email address
 #. 
-#: yelp-xsl.xml.in:450(msg/msgstr)
+#: yelp-xsl.xml.in:410(msg/msgstr)
 msgid "Send email to â??<string/>â??."
 msgstr ""
 
@@ -319,7 +374,7 @@ msgstr ""
 #. 
 #. <glossterm/> - The term being defined by the glossary entry
 #. 
-#: yelp-xsl.xml.in:462(msg/msgstr)
+#: yelp-xsl.xml.in:422(msg/msgstr)
 msgid "Read the definition for â??<glossterm/>â??."
 msgstr ""
 
@@ -339,7 +394,7 @@ msgstr ""
 #. 
 #. <glosssee/> - The actual link or links of the cross reference
 #. 
-#: yelp-xsl.xml.in:483(msg/msgstr)
+#: yelp-xsl.xml.in:443(msg/msgstr)
 msgid "See <glosssee/>."
 msgstr ""
 
@@ -360,7 +415,7 @@ msgstr ""
 #. 
 #. <glosssee/> - The actual link or links of the cross reference
 #. 
-#: yelp-xsl.xml.in:505(msg/msgstr)
+#: yelp-xsl.xml.in:465(msg/msgstr)
 msgid "See also <glosssee/>."
 msgstr ""
 
diff --git a/xslt/gettext/domains/yelp-xsl.xml.in b/xslt/gettext/domains/yelp-xsl.xml.in
index 9f9a6b1..7b7ae4a 100644
--- a/xslt/gettext/domains/yelp-xsl.xml.in
+++ b/xslt/gettext/domains/yelp-xsl.xml.in
@@ -298,109 +298,12 @@ appropriate content, as follows:
 
 &lt;label/> - The term being defined by the glossary entry
 </its:locNote>
-<msgstr>View the bibliography entry <label/>.</msgstr>
+<msgstr>View the bibliography entry <biblioentry.label/>.</msgstr>
 </msg>
 
-<!-- FIXME: generalize for DocBook -->
-<msgset>
-  <msgstr>comment.cite.name-date.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.
-
-  comment - Editorial comments
-  cite    - The source of a comment
-  http://projectmallard.org/1.0/mal_block_comment.html
-  http://projectmallard.org/1.0/mal_block_cite.html
-
-  This is a format message used to format the citation of a comment
-  made by an editor of a document. This appears on a new line after
-  the title of the comment, if a title is present, or as the first
-  line if a title is not present.
-
-  This string is used when both the name and the date are supplied.
-  In English, a title together with this format string might produce
-  something like this:
-
-    Some Comment Title
-    from Shaun McCance on 2010-06-03
-
-    Here is the text of the comment.
-
-  If only a name is supplied, and no date, then comment.cite.name.format
-  is used instead of this string.
-
-  Special elements in the message will be replaced with the
-  appropriate content, as follows:
-
-  comment.name - The name of the person making the comment
-  comment.date - The date the comment was made
-
-  These should be written as empty XML elements, e.g. <comment.name/>
-
-  Additionally, format messages can use the i, b, and tt markup tags
-  to mark text as italic, bold, and monospace.
-  -->
-  <_msg>
-    <msgstr>comment.cite.name-date.format</msgstr>
-    <msgstr>from <comment.name/> on <comment.date/></msgstr>
-  </_msg>
-</msgset>
-
-<!-- FIXME: generalize for DocBook -->
-<msgset>
-  <msgstr>comment.cite.name.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.
-
-  comment - Editorial comments
-  cite    - The source of a comment
-  http://projectmallard.org/1.0/mal_block_comment.html
-  http://projectmallard.org/1.0/mal_block_cite.html
-
-  This is a format message used to format the citation of a comment
-  made by an editor of a document. This appears on a new line after
-  the title of the comment, if a title is present, or as the first
-  line if a title is not present.
-
-  This string is used when only the name of the commenter is supplied.
-  In English, a title together with this format string might produce
-  something like this:
-
-    Some Comment Title
-    from Shaun McCance
-
-    Here is the text of the comment.
-
-  If a date is also supplied, then comment.cite.name-date.format
-  is used instead of this string.
-
-  Special elements in the message will be replaced with the
-  appropriate content, as follows:
-
-  comment.name - The name of the person making the comment
-
-  These should be written as empty XML elements, e.g. <comment.name/>
-
-  Additionally, format messages can use the i, b, and tt markup tags
-  to mark text as italic, bold, and monospace.
-  -->
-  <_msg>
-    <msgstr>comment.cite.name.format</msgstr>
-    <msgstr>from <comment.name/></msgstr>
-  </_msg>
-</msgset>
-
-<msg id="biblioentry.label.format">
+<msg id="biblioentry.label">
 <its:locNote>
-ID: biblioentry.label.format
+ID: biblioentry.label
 This is a format message used to format the labels for entries in
 a bibliography.  The content of the label is often an abbreviation
 of the authors' names and the year of publication.  In English,
@@ -421,9 +324,9 @@ appropriate content, as follows:
 <msgstr>[<biblioentry.label/>]</msgstr>
 </msg>
 
-<msg id="citation.format">
+<msg id="citation.label">
 <its:locNote>
-ID: citation.format
+ID: citation.label
 This is a format message used to format inline citations to other
 published works.  The content is typically an abbreviation of the
 authors' last names.  In English, this abbreviation is usually
@@ -435,7 +338,64 @@ appropriate content, as follows:
 &lt;citation/> - The text content of the citation element, possibly
               as a link to an entry in the bibliography
 </its:locNote>
-<msgstr>[<citation/>]</msgstr>
+<msgstr>[<citation.label/>]</msgstr>
+</msg>
+
+<msg id="comment.name-date">
+<its:locNote>
+ID: comment.name-date
+This is a format message used to format the citation of a comment
+made by an editor of a document. This appears on a new line after
+the title of the comment, if a title is present, or as the first
+line if a title is not present.
+
+This string is used when both the name and the date are supplied.
+In English, a title together with this format string might produce
+something like this:
+
+  Some Comment Title
+  from Shaun McCance on 2010-06-03
+
+  Here is the text of the comment.
+
+If only a name is supplied, and no date, then comment.name is used
+instead of this string.
+
+Special elements in the message will be replaced with the
+appropriate content, as follows:
+
+&lt;comment.name/> - The name of the person making the comment
+&lt;comment.date/> - The date the comment was made
+</its:locNote>
+<msgstr>from <comment.name/> on <comment.date/></msgstr>
+</msg>
+
+<msg id="comment.name">
+<its:locNote>
+ID: comment.name
+This is a format message used to format the citation of a comment
+made by an editor of a document. This appears on a new line after
+the title of the comment, if a title is present, or as the first
+line if a title is not present.
+
+This string is used when only the name of the commenter is supplied.
+In English, a title together with this format string might produce
+something like this:
+
+  Some Comment Title
+  from Shaun McCance
+
+  Here is the text of the comment.
+
+If a date is also supplied, then comment.name-date is used instead
+of this string.
+
+Special elements in the message will be replaced with the
+appropriate content, as follows:
+
+&lt;comment.name/> - The name of the person making the comment
+</its:locNote>
+<msgstr>from <comment.name/></msgstr>
 </msg>
 
 <msg id="email.tooltip">
diff --git a/xslt/mallard/html/mal2html-block.xsl b/xslt/mallard/html/mal2html-block.xsl
index d79cecc..61c845a 100644
--- a/xslt/mallard/html/mal2html-block.xsl
+++ b/xslt/mallard/html/mal2html-block.xsl
@@ -224,14 +224,14 @@ in accordance with the Mallard specification on fallback block content.
     <xsl:choose>
       <xsl:when test="@date">
         <xsl:call-template name="l10n.gettext">
-          <xsl:with-param name="msgid" select="'comment.cite.name-date.format'"/>
+          <xsl:with-param name="msgid" select="'comment.name-date'"/>
           <xsl:with-param name="node" select="."/>
           <xsl:with-param name="format" select="true()"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="l10n.gettext">
-          <xsl:with-param name="msgid" select="'comment.cite.name.format'"/>
+          <xsl:with-param name="msgid" select="'comment.name'"/>
           <xsl:with-param name="node" select="."/>
           <xsl:with-param name="format" select="true()"/>
         </xsl:call-template>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]