[MMBASE SCM] r40942 - in mmbase/branches/MMBase-1_9/applications/resources/src/main: java/org/mmbase/datatypes resources resources/org resources/org/mmbase resources/org/mmbase/datatypes resources/org/mmbase/datatypes/resources

[michiel]

Author: michiel
Date: 2010-02-09 16:30:15 +0100 (Tue, 09 Feb 2010)
New Revision: 40942

Added:
   mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/
   
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/
   
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/
   
mmbase/branches/MMBase-1_9/applications/resources/src/main/resources/org/mmbase/datatypes/resources/
   
mmbase/branches/MMBase-1_9/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_nl.properties
Modified:
   
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
Log:
translated string.captcha.error

Modified: 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
   2010-02-09 15:29:33 UTC (rev 40941)
+++ 
mmbase/branches/MMBase-1_9/applications/resources/src/main/java/org/mmbase/datatypes/CaptchaDataType.java
   2010-02-09 15:30:15 UTC (rev 40942)
@@ -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));
             }
         }

Added: 
mmbase/branches/MMBase-1_9/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
                           (rev 0)
+++ 
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)
@@ -0,0 +1 @@
+string.captcha.error=You must copy the text from the image.
\ No newline at end of file

Added: 
mmbase/branches/MMBase-1_9/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
                                (rev 0)
+++ 
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)
@@ -0,0 +1 @@
+string.captcha.error=Je moet de tekst uit het plaatje precies overtypen
\ No newline at end of file

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs