Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

dblayeroo : Update messages

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@4629 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2018-10-24 14:35:22 +00:00
parent 3e6c8714dc
commit 3b2f0e6f82
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dblayeroo.php
View File

@@ -2654,23 +2654,23 @@ class dblayeroo
if (in_array ("not null", $params) && if (in_array ("not null", $params) &&
! array_key_exists ($field, $values)) ! array_key_exists ($field, $values))
{ {
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' mandatory and not provided"), $field); "Field mandatory and not provided");
continue; continue;
} }
if (in_array ("not null", $params) && if (in_array ("not null", $params) &&
! in_array ("autoincrement", $params) && ! in_array ("autoincrement", $params) &&
$values[$field] === null) $values[$field] === null)
{ {
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' null and defined as NOT NULL and ". "Field null and defined as NOT NULL and ".
"not Autoincrement"), $field); "not Autoincrement");
continue; continue;
} }
if (! is_string ($values[$field]) && ! is_integer ($values[$field]) && if (! is_string ($values[$field]) && ! is_integer ($values[$field]) &&
! is_null ($values[$field])) ! is_null ($values[$field]))
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' not a string nor a integer"), $field); "Field not a string nor a integer");
// Do not check the format if the value to store is null. It will never // Do not check the format if the value to store is null. It will never
// matche any format. // matche any format.
if ($values[$field] === null) if ($values[$field] === null)
@@ -2679,30 +2679,29 @@ class dblayeroo
{ {
case "integer": case "integer":
if (strspn ($values[$field], "0123456789") !== strlen ($values[$field])) if (strspn ($values[$field], "0123456789") !== strlen ($values[$field]))
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' not in integer format"), $field); "Field not in integer format");
break; break;
case "varchar": case "varchar":
$length = $this->fieldLength ($field); $length = $this->fieldLength ($field);
if (mb_strlen ($values[$field]) > $length) if (mb_strlen ($values[$field]) > $length)
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework", "Field data too long");
"Field '%s' : Data field too long"), $field);
break; break;
case "date": case "date":
if (! preg_match ("#^\d{4}-\d{2}-\d{2}$#", $values[$field])) if (! preg_match ("#^\d{4}-\d{2}-\d{2}$#", $values[$field]))
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' not in date format"), $field); "Field not in date format");
break; break;
case "datetime": case "datetime":
if (! preg_match ("#^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$#", if (! preg_match ("#^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$#",
$values[$field])) $values[$field]))
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' not in datetime format"), $field); "Field not in datetime format");
break; break;
case "time": case "time":
if (! preg_match ("#^\d{2}:\d{2}:\d{2}$#", $values[$field])) if (! preg_match ("#^\d{2}:\d{2}:\d{2}$#", $values[$field]))
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = dgettext ("domframework",
"Field '%s' not in time format"), $field); "Field not in time format");
break; break;
default: default:
$errors[$field] = sprintf (dgettext ("domframework", $errors[$field] = sprintf (dgettext ("domframework",