You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/04/07 14:49:44 UTC
svn commit: r1465383 - in /ofbiz/branches/release11.04: ./
framework/base/src/org/ofbiz/base/util/UtilValidate.java
Author: jleroux
Date: Sun Apr 7 12:49:44 2013
New Revision: 1465383
URL: http://svn.apache.org/r1465383
Log:
"Applied fix from trunk for revision: 1465351"
------------------------------------------------------------------------
r1465351 | jleroux | 2013-04-07 11:35:26 +0200 (dim., 07 avr. 2013) | 9 lines
billhuang noticed at https://issues.apache.org/jira/browse/OFBIZ-5172 that "description is incorrect":
int org.ofbiz.base.util.UtilValidate.java file:
public static final String isMinuteMsg = "The Hour must be a number between 0 and 59.";
public static final String isSecondMsg = "The Hour must be a number between 0 and 59.";
should be
public static final String isMinuteMsg = "The Minute must be a number between 0 and 59.";
public static final String isSecondMsg = "The Second must be a number between 0 and 59.";
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1465351
Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java?rev=1465383&r1=1465382&r2=1465383&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java (original)
+++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilValidate.java Sun Apr 7 12:49:44 2013
@@ -19,14 +19,14 @@
package org.ofbiz.base.util;
import java.sql.Timestamp;
-import com.ibm.icu.util.Calendar;
import java.util.Collection;
import java.util.Map;
import org.apache.commons.validator.EmailValidator;
-
import org.ofbiz.base.lang.IsEmpty;
+import com.ibm.icu.util.Calendar;
+
/**
* General input/data validation methods
* Utility methods for validating data, especially input.
@@ -149,8 +149,8 @@ public class UtilValidate {
public static final String isDatePrefixMsg = "The Day, Month, and Year for ";
public static final String isDateSuffixMsg = " do not form a valid date. Please reenter them now.";
public static final String isHourMsg = "The Hour must be a number between 0 and 23.";
- public static final String isMinuteMsg = "The Hour must be a number between 0 and 59.";
- public static final String isSecondMsg = "The Hour must be a number between 0 and 59.";
+ public static final String isMinuteMsg = "The Minute must be a number between 0 and 59.";
+ public static final String isSecondMsg = "The Second must be a number between 0 and 59.";
public static final String isTimeMsg = "The Time must be a valid time formed like: HH:MM or HH:MM:SS.";
public static final String isDateMsg = "The Date must be a valid date formed like: MM/YY, MM/YYYY, MM/DD/YY, or MM/DD/YYYY.";
public static final String isDateAfterToday = "The Date must be a valid date after today, and formed like: MM/YY, MM/YYYY, MM/DD/YY, or MM/DD/YYYY.";