From 11972639df8315753123ebccdadee1f596807ad0 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Tue, 16 Sep 2014 08:03:29 +0000 Subject: Integrated new EasyGiant Library --- h-source/Library/Lang/Eng/DbCondStrings.php | 2 +- h-source/Library/Lang/Eng/Generic.php | 21 ++++++++++- h-source/Library/Lang/Eng/ModelStrings.php | 5 +-- h-source/Library/Lang/Eng/UploadStrings.php | 2 +- h-source/Library/Lang/Eng/ValCondStrings.php | 52 ++++++++++++++++++++-------- 5 files changed, 62 insertions(+), 20 deletions(-) (limited to 'h-source/Library/Lang/Eng') diff --git a/h-source/Library/Lang/Eng/DbCondStrings.php b/h-source/Library/Lang/Eng/DbCondStrings.php index e4196b6..cd625af 100644 --- a/h-source/Library/Lang/Eng/DbCondStrings.php +++ b/h-source/Library/Lang/Eng/DbCondStrings.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2011 Antonio Gallo +// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant diff --git a/h-source/Library/Lang/Eng/Generic.php b/h-source/Library/Lang/Eng/Generic.php index bb0ab99..29947fd 100644 --- a/h-source/Library/Lang/Eng/Generic.php +++ b/h-source/Library/Lang/Eng/Generic.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2011 Antonio Gallo +// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant @@ -33,6 +33,25 @@ class Lang_Eng_Generic 'move up' => 'move up', 'move down' => 'move down', 'associate' => 'associate', + 'up' => 'su', + 'down' => 'down', + 'link' => 'link', + 'del' => 'del', + 'back' => 'back', + 'Back' => 'Back', + 'add a new record' => 'add a new record', + 'Add' => 'Add', + 'back to the Panel' => 'back to the Panel', + 'Panel' => 'Panel', + 'previous' => 'previous', + 'next' => 'next', + 'All' => 'All', + 'pages' => 'pages', + 'filter' => 'filter', + 'clear the filter' => 'clear the filter', + 'Save' => 'Save', + 'Actions' => 'Actions', + '-- Select bulk action --' => '-- Select bulk action --', ); public function gtext($string) diff --git a/h-source/Library/Lang/Eng/ModelStrings.php b/h-source/Library/Lang/Eng/ModelStrings.php index fa741a2..20b8173 100644 --- a/h-source/Library/Lang/Eng/ModelStrings.php +++ b/h-source/Library/Lang/Eng/ModelStrings.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2011 Antonio Gallo +// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant @@ -30,7 +30,8 @@ class Lang_Eng_ModelStrings extends Lang_ResultStrings { "associate" => "
Referential integrity problem: record associated to some other record in a child table. Break the association before.
\n", "no-id" => "
Alert: record identifier not defined!
\n", "not-linked" => "
The Item is not associated : you can't dissociate it
", - "linked" => "
The Item is already associated: you can't associate it another time
" + "linked" => "
The Item is already associated: you can't associate it another time
", + "not-existing-fields" => "
Some fields in the query do not exist
\n", ); } diff --git a/h-source/Library/Lang/Eng/UploadStrings.php b/h-source/Library/Lang/Eng/UploadStrings.php index 2ae4c9b..ca0332b 100644 --- a/h-source/Library/Lang/Eng/UploadStrings.php +++ b/h-source/Library/Lang/Eng/UploadStrings.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2011 Antonio Gallo +// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant diff --git a/h-source/Library/Lang/Eng/ValCondStrings.php b/h-source/Library/Lang/Eng/ValCondStrings.php index 42e70d8..f5d40a2 100644 --- a/h-source/Library/Lang/Eng/ValCondStrings.php +++ b/h-source/Library/Lang/Eng/ValCondStrings.php @@ -2,7 +2,7 @@ // EasyGiant is a PHP framework for creating and managing dynamic content // -// Copyright (C) 2009 - 2011 Antonio Gallo +// Copyright (C) 2009 - 2014 Antonio Gallo (info@laboratoriolibero.com) // See COPYRIGHT.txt and LICENSE.txt. // // This file is part of EasyGiant @@ -27,67 +27,89 @@ class Lang_Eng_ValCondStrings { //if the element is not defined public function getNotDefinedResultString($element) { - return "
". $element ." not defined!
\n"; + return "
". $element ." not defined!
\n"; } //if the elements are not equal public function getNotEqualResultString($element) { - return "
Different values: $element
\n"; + return "
Different values: $element
\n"; } //if the element is not alphabetic public function getNotAlphabeticResultString($element) { - return "
".$element." has to be alphabetic
\n"; + return "
".$element." has to be alphabetic
\n"; } //if the element is not alphanumeric public function getNotAlphanumericResultString($element) { - return "
".$element." has to be alphanumeric
\n"; + return "
".$element." has to be alphanumeric
\n"; } //if the element is not a decimal digit public function getNotDecimalDigitResultString($element) { - return "
".$element." has to be a decimal digit
\n"; + return "
".$element." has to be a decimal digit
\n"; } - //if the element has the mail format + //if the element hasn't the mail format public function getNotMailFormatResultString($element) { - return "
".$element." doesn't seem an e-mail address
\n"; + return "
".$element." doesn't seem an e-mail address
\n"; } - //if the element is numeric + //if the element is not numeric public function getNotNumericResultString($element) { - return "
".$element." has to be a numeric
\n"; + return "
".$element." has to be a numeric
\n"; + } + + //if the element is not an integer + public function getNotIntegerFormatResultString($element) + { + return "
".$element." has to be an integer
\n"; + } + + //if the element is not a real date + public function getNotDateResultString($element) + { + return "
".$element." has to be a real date (YYYY-MM-DD)
\n"; } //if the element (string) length exceeds the value of characters (defined by $maxLength) public function getLengthExceedsResultString($element,$maxLength) { - return "
".$element." exceeds the value of $maxLength characters
\n"; + return "
".$element." exceeds the value of $maxLength characters
\n"; } //if the element is one of the strings indicated by $stringList (a comma-separated list of strings) public function getIsForbiddenStringResultString($element,$stringList) { - return "
".$element." can't be one of the following strings: $stringList
\n"; + return "
".$element." can't be one of the following strings: $stringList
\n"; } //if the element is not one of the strings indicated by $stringList (a comma-separated list of strings) public function getIsNotStringResultString($element,$stringList) { - return "
".$element." has to be one of the following strings: $stringList
\n"; + return "
".$element." has to be one of the following strings: $stringList
\n"; } - //if the element is not one of the strings indicated by $stringList (a comma-separated list of strings) + //if the element does not match the reg expr indicated by $regExp public function getDoesntMatchResultString($element,$regExp) { - return "
".$element." has to match the following regular expression: $regExp
\n"; + return "
".$element." has to match the following regular expression: $regExp
\n"; + } + + //if the element is not decimal + public function getNotDecimalResultString($element, $format) + { + $t = explode(",",$format); + $M = (int)$t[0]; + $D = (int)$t[1]; + $I = $M - $D; + return "
".$element." has to be a decimal number (maximum number of integer digits:$I, maximum number of decimal digits: $D)
\n"; } } -- cgit v1.2.3