You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/01/23 17:23:45 UTC
svn commit: r499067 - in /lenya/trunk/src:
modules/languageselector/resources/i18n/cmsui.xml
modules/languageselector/xslt/resizesvg.xsl
pubs/default/resources/shared/css/page.xml pubs/default/sitemap.xmap
Author: nettings
Date: Tue Jan 23 08:23:44 2007
New Revision: 499067
URL: http://svn.apache.org/viewvc?view=rev&rev=499067
Log:
languageselector: minor style changes, better i18n, limit max height in
svn flag resizer to avoid heap overflows.
Modified:
lenya/trunk/src/modules/languageselector/resources/i18n/cmsui.xml
lenya/trunk/src/modules/languageselector/xslt/resizesvg.xsl
lenya/trunk/src/pubs/default/resources/shared/css/page.xml
lenya/trunk/src/pubs/default/sitemap.xmap
Modified: lenya/trunk/src/modules/languageselector/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/languageselector/resources/i18n/cmsui.xml?view=diff&rev=499067&r1=499066&r2=499067
==============================================================================
--- lenya/trunk/src/modules/languageselector/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules/languageselector/resources/i18n/cmsui.xml Tue Jan 23 08:23:44 2007
@@ -26,22 +26,22 @@
<message key="en-isCurrent">English is your currently selected language.</message>
<message key="en-isUnavailable">Sorry, no English translation is available for this document.</message>
- <message key="en-isAvailable">Switch to English translation.</message>
+ <message key="en-isAvailable">switch to English translation</message>
<message key="de-isCurrent">Deutsch ist die aktuell gewählte Sprache.</message>
<message key="de-isUnavailable">Leider ist für diese Seite keine deutsche Ãbersetzung verfügbar.</message>
- <message key="de-isAvailable">Zur deutschen Ãbersetzung.</message>
+ <message key="de-isAvailable">zur deutschen Ãbersetzung</message>
<!-- sorry, my french sucks. anyone? -->
<message key="fr-isCurrent">Vous lisez la version française.</message>
- <message key="fr-isUnavailable">Nous regrettons qu'il n'y'a pas de traduction française.</message>
- <message key="fr-isAvailable">Vers la version française.</message>
+ <message key="fr-isUnavailable">Nous regrettons qu'il n'y a pas de traduction française.</message>
+ <message key="fr-isAvailable">vers la version française</message>
<!-- my spanish either. -->
- <message key="es-isCurrent">Spanish is your currently selected language.</message>
- <message key="es-isUnavailable">Sorry, no Spanish version is available for this document.</message>
- <message key="es-isAvailable">Go to Spanish translation.</message>
+ <message key="es-isCurrent">Eso es castellano.</message>
+ <message key="es-isUnavailable">Desafortunadamente no hay una traducción castellana.</message>
+ <message key="es-isAvailable">para la traducción castellana</message>
<!-- my hebrew is even worse. -->
- <message key="he-isCurrent">×¢×ר×ת is your currently selected language.</message>
- <message key="he-isUnavailable">Sorry, no ×¢×ר×ת translation is available for this page.</message>
- <message key="he-isAvailable">Change to ×¢×ר×ת version.</message>
+ <message key="he-isCurrent">.×× ××¡×¤× ×¢×ר×ת</message>
+ <message key="he-isUnavailable">.×× ×× × ××¢××× ××× ××¢×ר×ת</message>
+ <message key="he-isAvailable">.××¢××× ×¢×ר×ת</message>
<message key="en">English</message>
<message key="de">Deutsch</message>
<message key="fr">Français</message>
Modified: lenya/trunk/src/modules/languageselector/xslt/resizesvg.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/languageselector/xslt/resizesvg.xsl?view=diff&rev=499067&r1=499066&r2=499067
==============================================================================
--- lenya/trunk/src/modules/languageselector/xslt/resizesvg.xsl (original)
+++ lenya/trunk/src/modules/languageselector/xslt/resizesvg.xsl Tue Jan 23 08:23:44 2007
@@ -25,22 +25,34 @@
<xsl:param name="height"/>
+ <!-- prevent users from causing memory overflows: -->
+ <xsl:variable name="maxHeight" select="1024"/>
+
<!--
scales an svg to height $height.
this is done by surrounding the image with a new <svg/> element with the desired height and
proportional width, and a viewBox whose dimensions are taken from the original image.
-->
<xsl:template match="/svg:svg">
- <svg:svg>
- <xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
- <xsl:if test="number(@width) > 0 and number(@height) > 0">
- <xsl:attribute name="width"><xsl:value-of select="ceiling(@width div @height * $height)"/></xsl:attribute>
- </xsl:if>
- <xsl:attribute name="viewBox"><xsl:value-of select="concat('0 0 ', @width, ' ', @height)"/></xsl:attribute>
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </svg:svg>
+ <xsl:choose>
+ <xsl:when test="number($height) > 0 and number($height) <= $maxHeight">
+ <svg:svg>
+ <xsl:attribute name="height"><xsl:value-of select="$height"/></xsl:attribute>
+ <xsl:if test="number(@width) > 0 and number(@height) > 0">
+ <xsl:attribute name="width"><xsl:value-of select="ceiling(@width div @height * $height)"/></xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="viewBox"><xsl:value-of select="concat('0 0 ', @width, ' ', @height)"/></xsl:attribute>
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </svg:svg>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ Wow. You requested an image height of <xsl:value-of select="$height"/>. No way José. Go DoS someone else.
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match="@*|node()" name="identity">
Modified: lenya/trunk/src/pubs/default/resources/shared/css/page.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/resources/shared/css/page.xml?view=diff&rev=499067&r1=499066&r2=499067
==============================================================================
--- lenya/trunk/src/pubs/default/resources/shared/css/page.xml (original)
+++ lenya/trunk/src/pubs/default/resources/shared/css/page.xml Tue Jan 23 08:23:44 2007
@@ -114,20 +114,21 @@
font-size:80%;
}
-#languageselector img {
+#languageselector a img {
border:none;
+ margin:0;
+ padding:0;
}
#menu a, #languageselector a {
text-decoration: none;
color: Maroon;
}
-#languageselector a {
- padding:0px;
- margin:0px;
-}
#languageselector a.lenya-language-isCurrent {
font-weight:bold;
+}
+#languageselector a.lenya-language-isCurrent img {
+ border: solid 2px Maroon;
}
#languageselector a.lenya-language-isAvailable {
}
Modified: lenya/trunk/src/pubs/default/sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/sitemap.xmap?view=diff&rev=499067&r1=499066&r2=499067
==============================================================================
--- lenya/trunk/src/pubs/default/sitemap.xmap (original)
+++ lenya/trunk/src/pubs/default/sitemap.xmap Tue Jan 23 08:23:44 2007
@@ -134,7 +134,7 @@
<map:part src="cocoon://modules/sitetree/{2}/{3}/tabs/{5}.xml"/>
<map:part src="cocoon://modules/sitetree/{2}/{3}/menu/{5}.xml"/>
<map:part src="cocoon://modules/sitetree/{2}/{3}/search/{5}.xml"/>
- <map:part src="cocoon://modules/languageselector/text-long/flagsize-10"/>
+ <map:part src="cocoon://modules/languageselector/text-none/flagsize-10"/>
<map:part src="{resource-type:format-xhtml}?rendertype={1}"/>
</map:aggregate>
<map:transform type="link-rewrite"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org