Author: juanpablo
Date: Tue Mar 18 09:18:05 2008
New Revision: 638431
URL: http://svn.apache.org/viewvc?rev=638431&view=rev
Log:
* 2.6.2-rc-3
* [JSPWIKI-214]. Table with id asirra_KnobsTable had two unlocalized
strings, added to CoreResources.properties. Detected by Florian
Holeczek.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=638431&r1=638430&r2=638431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Mar 18 09:18:05 2008
@@ -1,3 +1,11 @@
+2008-03-18 Juan Pablo Santos <[EMAIL PROTECTED]>
+
+ * 2.6.2-rc-3
+
+ * [JSPWIKI-214]. Table with id asirra_KnobsTable had two unlocalized
+ strings, added to CoreResources.properties. Detected by Florian
Holeczek.
+
+
2008-03-16 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.6.2-rc-2
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=638431&r1=638430&r2=638431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Tue Mar 18
09:18:05 2008
@@ -97,6 +97,8 @@
set of images, so we know you are a normal human being?
captcha.asirra.please.select=Please select all the cat photos:
captcha.asirra.adopt.me=Adopt me
+captcha.asirra.a.get.challenge=Request different images.
+captcha.asirra.a.whatsthis=What is this?
captcha.submit=Submit
# Install.jsp
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=638431&r1=638430&r2=638431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Tue Mar 18
09:18:05 2008
@@ -91,6 +91,8 @@
imágenes inferior, de tal modo que sepamos que eres un ser
humano normal?
captcha.asirra.please.select=Por favor, selecciona todas las fotografías de
gatos:
captcha.asirra.adopt.me=Adóptame
+captcha.asirra.a.get.challenge=Pedir otras imágenes
+captcha.asirra.a.whatsthis=¿Qué es esto?
captcha.submit=Enviar
# Install.jsp
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=638431&r1=638430&r2=638431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Tue Mar 18
09:18:05 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "2";
+ public static final String BUILD = "3";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=638431&r1=638430&r2=638431&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Tue Mar 18 09:18:05 2008
@@ -74,7 +74,10 @@
for ( var i = 0; i < 12; i++)
{
document.getElementById("asirra_AdoptMeDiv" +
i).getElementsByTagName("a")[0].innerHTML= '<font size="-1">' + '<fmt:message
key="captcha.asirra.adopt.me" />' + '</font>' ;
- }
+ }
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[0].title="<fmt:message
key="captcha.asirra.a.get.challenge" />";
+
document.getElementById("asirra_KnobsTable").getElementsByTagName("a")[1].title="<fmt:message
key="captcha.asirra.a.whatsthis" />";
+ document.getElementById("mainForm").style.display="block"; // show form
when i18n is done
}
</script>
</head>
@@ -82,7 +85,7 @@
<div style="margin:8px">
<p><fmt:message key="captcha.description" /></p>
- <form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm">
+ <form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm" style="display: none;">
<input type="hidden" value="foo" name="text" />
<input type="hidden" value='<%=request.getParameter("page")%>'
name='page'/>
<script type="text/javascript"
src="http://challenge.asirra.com/js/AsirraClientSide.js";></script>
