Author: michiel
Date: 2010-02-09 16:36:32 +0100 (Tue, 09 Feb 2010)
New Revision: 40944
Added:
mmbase/trunk/applications/resources/src/main/resources/org/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
Removed:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/captcha.tagx
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/thumb.tagx
Log:
translated string.captcha.error
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
===================================================================
---
mmbase/trunk/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
2010-02-09 15:33:28 UTC (rev 40943)
+++
mmbase/trunk/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
2010-02-09 15:36:32 UTC (rev 40944)
@@ -152,8 +152,11 @@
CaptchaRestriction() {
super("captcha", null);
}
-
@Override
+ protected String getErrorDescriptionBundle() {
+ return "org.mmbase.datatypes.resources.resourcesdatatypes";
+ }
+ @Override
protected boolean simpleValid(final Object v, final Node node, final
Field field) {
Cloud cloud = CloudThreadLocal.currentCloud();
if (cloud == null) {
@@ -176,9 +179,6 @@
return false;
}
LOG.debug("Found " + KEY + " is " + value + " (user provided
'" + v + "')");
- if (cloud.getProperty(Node.CLOUD_COMMITNODE_KEY) ==
Integer.valueOf(node.getNumber())) {
- session.removeAttribute(KEY);
- }
return mustbe.equalsIgnoreCase(Casting.toString(v));
}
}
Modified:
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/captcha.tagx
===================================================================
---
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/captcha.tagx
2010-02-09 15:33:28 UTC (rev 40943)
+++
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/captcha.tagx
2010-02-09 15:36:32 UTC (rev 40944)
@@ -36,10 +36,8 @@
description="Font file to use to produce the text.
E.g. mm:fonts/arial.ttf (mm: is mean 'mmbase configuration directory')"
/>
- <jsp:directive.attribute name="key" type="java.lang.String"
- description="If the key is stated explicitely, no
new key is generated, but this given one is shown"
-
- />
+ <!-- If the key is stated explicitely, no new key is generated, but this
given one is shown. -->
+ <jsp:directive.attribute name="key" type="java.lang.String" />
<jsp:scriptlet>
InputStream input = null;
String text = null;;
Modified:
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/thumb.tagx
===================================================================
---
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/thumb.tagx
2010-02-09 15:33:28 UTC (rev 40943)
+++
mmbase/trunk/applications/resources/src/main/resources/META-INF/tags/mm/resources/thumb.tagx
2010-02-09 15:36:32 UTC (rev 40944)
@@ -66,4 +66,4 @@
</c:choose>
</mm:link>
-</jsp:root>
\ No newline at end of file
+</jsp:root>
Copied: mmbase/trunk/applications/resources/src/main/resources/org (from rev
40942, mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org)
Copied: mmbase/trunk/applications/resources/src/main/resources/org/mmbase (from
rev 40942,
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase)
Copied:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes
(from rev 40942,
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes)
Copied:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources
(from rev 40942,
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources)
Deleted:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
2010-02-09 15:30:15 UTC (rev 40942)
+++
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
2010-02-09 15:36:32 UTC (rev 40944)
@@ -1 +0,0 @@
-string.captcha.error=You must copy the text from the image.
\ No newline at end of file
Copied:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
(from rev 40942,
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties)
===================================================================
---
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
(rev 0)
+++
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes.properties
2010-02-09 15:36:32 UTC (rev 40944)
@@ -0,0 +1 @@
+string.captcha.error=You must copy the text from the image.
\ No newline at end of file
Deleted:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
===================================================================
---
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
2010-02-09 15:30:15 UTC (rev 40942)
+++
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
2010-02-09 15:36:32 UTC (rev 40944)
@@ -1 +0,0 @@
-string.captcha.error=Je moet de tekst uit het plaatje precies overtypen
\ No newline at end of file
Copied:
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
(from rev 40942,
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties)
===================================================================
---
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
(rev 0)
+++
mmbase/trunk/applications/resources/src/main/resources/org/mmbase/datatypes/resources/resourcesdatatypes_nl.properties
2010-02-09 15:36:32 UTC (rev 40944)
@@ -0,0 +1 @@
+string.captcha.error=Je moet de tekst uit het plaatje precies overtypen
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
