dblayeroo : Update messages
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@4629 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
@@ -2654,23 +2654,23 @@ class dblayeroo
|
||||
if (in_array ("not null", $params) &&
|
||||
! array_key_exists ($field, $values))
|
||||
{
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' mandatory and not provided"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field mandatory and not provided");
|
||||
continue;
|
||||
}
|
||||
if (in_array ("not null", $params) &&
|
||||
! in_array ("autoincrement", $params) &&
|
||||
$values[$field] === null)
|
||||
{
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' null and defined as NOT NULL and ".
|
||||
"not Autoincrement"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field null and defined as NOT NULL and ".
|
||||
"not Autoincrement");
|
||||
continue;
|
||||
}
|
||||
if (! is_string ($values[$field]) && ! is_integer ($values[$field]) &&
|
||||
! is_null ($values[$field]))
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' not a string nor a integer"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field not a string nor a integer");
|
||||
// Do not check the format if the value to store is null. It will never
|
||||
// matche any format.
|
||||
if ($values[$field] === null)
|
||||
@@ -2679,30 +2679,29 @@ class dblayeroo
|
||||
{
|
||||
case "integer":
|
||||
if (strspn ($values[$field], "0123456789") !== strlen ($values[$field]))
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' not in integer format"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field not in integer format");
|
||||
break;
|
||||
case "varchar":
|
||||
$length = $this->fieldLength ($field);
|
||||
if (mb_strlen ($values[$field]) > $length)
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' : Data field too long"), $field);
|
||||
$errors[$field] = dgettext ("domframework", "Field data too long");
|
||||
break;
|
||||
case "date":
|
||||
if (! preg_match ("#^\d{4}-\d{2}-\d{2}$#", $values[$field]))
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' not in date format"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field not in date format");
|
||||
break;
|
||||
case "datetime":
|
||||
if (! preg_match ("#^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$#",
|
||||
$values[$field]))
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' not in datetime format"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field not in datetime format");
|
||||
break;
|
||||
case "time":
|
||||
if (! preg_match ("#^\d{2}:\d{2}:\d{2}$#", $values[$field]))
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
"Field '%s' not in time format"), $field);
|
||||
$errors[$field] = dgettext ("domframework",
|
||||
"Field not in time format");
|
||||
break;
|
||||
default:
|
||||
$errors[$field] = sprintf (dgettext ("domframework",
|
||||
|
||||
Reference in New Issue
Block a user