You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2012/08/27 11:18:24 UTC
svn commit: r1377616 - in /db/derby/docs/trunk: lib/ src/adminguide/
src/devguide/ src/getstart/ src/ja_JP/getstart/ src/ja_JP/ref/
src/pt_BR/adminguide/ src/pt_BR/getstart/ src/pt_BR/ref/ src/ref/
src/tools/ src/tuning/
Author: kahatlen
Date: Mon Aug 27 09:18:23 2012
New Revision: 1377616
URL: http://svn.apache.org/viewvc?rev=1377616&view=rev
Log:
DERBY-5909: The lang attribute in toc.html always says 'en-us'
Specify language in the ditamap files, and make map2htmtoc.xsl pass
the language attributes through to the generated HTML files.
Modified:
db/derby/docs/trunk/lib/map2htmtoc.xsl
db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
db/derby/docs/trunk/src/devguide/derbydev.ditamap
db/derby/docs/trunk/src/getstart/getstartderby.ditamap
db/derby/docs/trunk/src/ja_JP/getstart/getstartderby.ditamap
db/derby/docs/trunk/src/ja_JP/ref/refderby.ditamap
db/derby/docs/trunk/src/pt_BR/adminguide/derbyadmin.ditamap
db/derby/docs/trunk/src/pt_BR/getstart/getstartderby.ditamap
db/derby/docs/trunk/src/pt_BR/ref/refderby.ditamap
db/derby/docs/trunk/src/ref/refderby.ditamap
db/derby/docs/trunk/src/tools/derbytools.ditamap
db/derby/docs/trunk/src/tuning/tuningderby.ditamap
Modified: db/derby/docs/trunk/lib/map2htmtoc.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/lib/map2htmtoc.xsl?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/lib/map2htmtoc.xsl (original)
+++ db/derby/docs/trunk/lib/map2htmtoc.xsl Mon Aug 27 09:18:23 2012
@@ -92,12 +92,7 @@
<xsl:template name="setTocLanguage">
<xsl:variable name="childlang">
- <xsl:choose>
- <xsl:when test="self::dita">
- <xsl:for-each select="*[1]"><xsl:call-template name="getLowerCaseLang"/></xsl:for-each>
- </xsl:when>
- <xsl:otherwise><xsl:call-template name="getLowerCaseLang"/></xsl:otherwise>
- </xsl:choose>
+ <xsl:for-each select="/map"><xsl:call-template name="getLowerCaseLang"/></xsl:for-each>
</xsl:variable>
<xsl:attribute name="lang"><xsl:value-of select="$childlang"/></xsl:attribute>
<xsl:attribute name="xml:lang"><xsl:value-of select="$childlang"/></xsl:attribute>
Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Mon Aug 27 09:18:23 2012
@@ -22,7 +22,7 @@
-->
<!--LS 8/1/06 - Updated for Derby-1628-->
<!--LS 8/23/06 - Updated for Derby-1682-->
-<map title="Server and Administration Guide">
+<map xml:lang="en-us" title="Server and Administration Guide">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>
Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Developer's Guide">
+<map xml:lang="en-us" title="Developer's Guide">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>
Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Getting Started with Derby">
+<map xml:lang="en-us" title="Getting Started with Derby">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>
Modified: db/derby/docs/trunk/src/ja_JP/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ja_JP/getstart/getstartderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ja_JP/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/ja_JP/getstart/getstartderby.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Getting Started with Derby">
+<map xml:lang="ja" title="Getting Started with Derby">
<topicmeta>
<copyright>
<copyryear year="2004, 2006"/>
Modified: db/derby/docs/trunk/src/ja_JP/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ja_JP/ref/refderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ja_JP/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ja_JP/ref/refderby.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="ãªãã¡ã¬ã³ã¹ããã¥ã¢ã«">
+<map xml:lang="ja" title="ãªãã¡ã¬ã³ã¹ããã¥ã¢ã«">
<topicmeta>
<copyright>
<copyryear year="2004, 2008"/>
Modified: db/derby/docs/trunk/src/pt_BR/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/pt_BR/adminguide/derbyadmin.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/pt_BR/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/pt_BR/adminguide/derbyadmin.ditamap Mon Aug 27 09:18:23 2012
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Guia do Servidor e Administração">
+<map xml:lang="pt-br" title="Guia do Servidor e Administração">
<topicmeta>
<copyright>
<copyryear year="1997, 2005"/>
Modified: db/derby/docs/trunk/src/pt_BR/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/pt_BR/getstart/getstartderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/pt_BR/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/pt_BR/getstart/getstartderby.ditamap Mon Aug 27 09:18:23 2012
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Introdução ao Derby">
+<map xml:lang="pt-br" title="Introdução ao Derby">
<topicmeta>
<copyright>
<copyryear year="1997, 2006"/>
Modified: db/derby/docs/trunk/src/pt_BR/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/pt_BR/ref/refderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/pt_BR/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/pt_BR/ref/refderby.ditamap Mon Aug 27 09:18:23 2012
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Reference Manual">
+<map xml:lang="pt-br" title="Reference Manual">
<topicmeta>
<copyright>
<copyryear year="1997, 2005"/>
Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Reference Manual">
+<map xml:lang="en-us" title="Reference Manual">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>
Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Tools and Utilities Guide">
+<map xml:lang="en-us" title="Tools and Utilities Guide">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>
Modified: db/derby/docs/trunk/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/tuningderby.ditamap?rev=1377616&r1=1377615&r2=1377616&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/trunk/src/tuning/tuningderby.ditamap Mon Aug 27 09:18:23 2012
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<map title="Tuning Derby">
+<map xml:lang="en-us" title="Tuning Derby">
<topicmeta>
<copyright>
<copyryear year="2004, @COPYRIGHT_YEAR@"/>