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/En/DbCondStrings.php | 6 +-- h-source/Library/Lang/En/Formats/Fields.php | 46 ++++++++++++++++ h-source/Library/Lang/En/Formats/From/Mysql.php | 64 ++++++++++++++++++++++ h-source/Library/Lang/En/Formats/From/index.html | 1 + h-source/Library/Lang/En/Formats/To/Mysql.php | 62 +++++++++++++++++++++ h-source/Library/Lang/En/Formats/To/index.html | 1 + h-source/Library/Lang/En/Formats/index.html | 1 + h-source/Library/Lang/En/Generic.php | 4 +- h-source/Library/Lang/En/ModelStrings.php | 24 +++++---- h-source/Library/Lang/En/UploadStrings.php | 2 +- h-source/Library/Lang/En/ValCondStrings.php | 68 ++++++++++++++++++------ 11 files changed, 249 insertions(+), 30 deletions(-) create mode 100644 h-source/Library/Lang/En/Formats/Fields.php create mode 100644 h-source/Library/Lang/En/Formats/From/Mysql.php create mode 100755 h-source/Library/Lang/En/Formats/From/index.html create mode 100644 h-source/Library/Lang/En/Formats/To/Mysql.php create mode 100755 h-source/Library/Lang/En/Formats/To/index.html create mode 100755 h-source/Library/Lang/En/Formats/index.html (limited to 'h-source/Library/Lang/En') diff --git a/h-source/Library/Lang/En/DbCondStrings.php b/h-source/Library/Lang/En/DbCondStrings.php index bfc5867..0c72d95 100644 --- a/h-source/Library/Lang/En/DbCondStrings.php +++ b/h-source/Library/Lang/En/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 @@ -23,12 +23,12 @@ if (!defined('EG')) die('Direct access not allowed!'); //error strings in the case database conditions are not satisfied -class Lang_En_DbCondStrings { +class Lang_En_DbCondStrings extends Lang_En_ValCondStrings { //get the error string in the case that the value of the field $field is already present in the table $table public function getNotUniqueString($field) { - return "
The value of ". $field ." is already present. Please choose a different value.
\n"; + return "
The value of ". getFieldLabel($field) ." is already present. Please choose a different value.
\n".$this->getHiddenAlertElement($field); } } diff --git a/h-source/Library/Lang/En/Formats/Fields.php b/h-source/Library/Lang/En/Formats/Fields.php new file mode 100644 index 0000000..c91a1f0 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/Fields.php @@ -0,0 +1,46 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class Lang_En_Formats_Fields +{ + + public static function getLabel($fieldName) + { + if (strstr($fieldName,",")) + { + $temp = explode(",",$fieldName); + for ($i=0; $i< count($temp); $i++) + { + $temp[$i] = self::getLabel($temp[$i]); + } + return implode (" and ",$temp); + } + else + { + $fieldName = str_replace("_"," ", $fieldName); + return ucfirst($fieldName); + } + } + +} diff --git a/h-source/Library/Lang/En/Formats/From/Mysql.php b/h-source/Library/Lang/En/Formats/From/Mysql.php new file mode 100644 index 0000000..5e4ea07 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/From/Mysql.php @@ -0,0 +1,64 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class Lang_En_Formats_From_Mysql +{ + + //convert the string from MySQL decimal format to En decimal format + public function decimal($string) + { + return $string; + } + + //convert the string from MySQL float format to En float format + public function float($string) + { + return $string; + } + + //convert the string from MySQL double format to En double format + public function double($string) + { + return $string; + } + + + //convert the string from MySQL date format to En date format + public function date($date) + { + if (preg_match('/^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/',$date)) + { + $dateArray = explode('-',$date); + return $dateArray[1]."-".$dateArray[2]."-".$dateArray[0]; + } + return $date; + } + + //convert the string from MySQL enum format to En enum format + public function enum($string) + { + return $string; + } + +} \ No newline at end of file diff --git a/h-source/Library/Lang/En/Formats/From/index.html b/h-source/Library/Lang/En/Formats/From/index.html new file mode 100755 index 0000000..8d1c8b6 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/From/index.html @@ -0,0 +1 @@ + diff --git a/h-source/Library/Lang/En/Formats/To/Mysql.php b/h-source/Library/Lang/En/Formats/To/Mysql.php new file mode 100644 index 0000000..31daab8 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/To/Mysql.php @@ -0,0 +1,62 @@ +. + +if (!defined('EG')) die('Direct access not allowed!'); + +class Lang_En_Formats_To_Mysql +{ + + //convert the string from En decimal format to MySQL decimal format + public function decimal($string) + { + return $string; + } + + //convert the string from En float format to MySQL float format + public function float($string) + { + return $string; + } + + //convert the string from En double format to MySQL double format + public function double($string) + { + return $string; + } + + //convert the string from En date format to MySQL date format + public function date($date) + { + if (preg_match('/^[0-9]{2}\-[0-9]{2}\-[0-9]{4}$/',$date)) + { + $dateArray = explode('-',$date); + return $dateArray[2]."-".$dateArray[0]."-".$dateArray[1]; + } + return $date; + } + + //convert the string from En enum format to MySQL enum format + public function enum($string) + { + return $string; + } +} \ No newline at end of file diff --git a/h-source/Library/Lang/En/Formats/To/index.html b/h-source/Library/Lang/En/Formats/To/index.html new file mode 100755 index 0000000..8d1c8b6 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/To/index.html @@ -0,0 +1 @@ + diff --git a/h-source/Library/Lang/En/Formats/index.html b/h-source/Library/Lang/En/Formats/index.html new file mode 100755 index 0000000..8d1c8b6 --- /dev/null +++ b/h-source/Library/Lang/En/Formats/index.html @@ -0,0 +1 @@ + diff --git a/h-source/Library/Lang/En/Generic.php b/h-source/Library/Lang/En/Generic.php index c940949..8df27a9 100644 --- a/h-source/Library/Lang/En/Generic.php +++ b/h-source/Library/Lang/En/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 @@ -50,6 +50,8 @@ class Lang_En_Generic '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/En/ModelStrings.php b/h-source/Library/Lang/En/ModelStrings.php index cf26b8f..266b1d2 100644 --- a/h-source/Library/Lang/En/ModelStrings.php +++ b/h-source/Library/Lang/En/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 @@ -24,13 +24,19 @@ if (!defined('EG')) die('Direct access not allowed!'); class Lang_En_ModelStrings extends Lang_ResultStrings { - public $string = array( - "error" => "
Query error: Contact the administrator!
\n", - "executed" => "
Operation executed!
\n", - "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
" - ); + public function __construct() { + + $this->string = array( + "error" => "
Query error: Contact the administrator!
\n", + "executed" => "
Operation executed!
\n", + "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
", + "not-existing-fields" => "
Some fields in the query do not exist
\n", + "no-fields" => "
There are no values in the insert/update query
\n", + ); + + } } diff --git a/h-source/Library/Lang/En/UploadStrings.php b/h-source/Library/Lang/En/UploadStrings.php index 61bc0c5..572f7bb 100644 --- a/h-source/Library/Lang/En/UploadStrings.php +++ b/h-source/Library/Lang/En/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/En/ValCondStrings.php b/h-source/Library/Lang/En/ValCondStrings.php index 7f4e7ea..8742c23 100644 --- a/h-source/Library/Lang/En/ValCondStrings.php +++ b/h-source/Library/Lang/En/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 @@ -24,70 +24,106 @@ if (!defined('EG')) die('Direct access not allowed!'); class Lang_En_ValCondStrings { + //get the HTMl of the hidden alert notices + public function getHiddenAlertElement($element) + { + $html = ""; + $t = explode(",",$element); + + foreach ($t as $el) + { + $html .= "
$el
"; + } + + return $html; + } + //if the element is not defined public function getNotDefinedResultString($element) { - return "
". $element ." not defined!
\n"; + return "
Please fill the field ". getFieldLabel($element) .".
\n".$this->getHiddenAlertElement($element); } //if the elements are not equal public function getNotEqualResultString($element) { - return "
Different values: $element
\n"; + return "
Please check that the fields ".getFieldLabel($element)." are equal
\n".$this->getHiddenAlertElement($element); } //if the element is not alphabetic public function getNotAlphabeticResultString($element) { - return "
".$element." has to be alphabetic
\n"; + return "
Please check that the field ".getFieldLabel($element)." is alphabetic
\n".$this->getHiddenAlertElement($element); } //if the element is not alphanumeric public function getNotAlphanumericResultString($element) { - return "
".$element." has to be alphanumeric
\n"; + return "
Please check that the field ".getFieldLabel($element)." has to be alphanumeric
\n".$this->getHiddenAlertElement($element); } //if the element is not a decimal digit public function getNotDecimalDigitResultString($element) { - return "
".$element." has to be a decimal digit
\n"; + return "
Please check that the field ".getFieldLabel($element)." is a decimal digit
\n".$this->getHiddenAlertElement($element); } - - //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 "
Please check that the field ".getFieldLabel($element)." is an e-mail address
\n".$this->getHiddenAlertElement($element); } - //if the element is numeric + //if the element is not numeric public function getNotNumericResultString($element) { - return "
".$element." has to be a numeric
\n"; + return "
Please check that the field ".getFieldLabel($element)." is numeric
\n".$this->getHiddenAlertElement($element); + } + + //if the element is not an integer + public function getNotIntegerFormatResultString($element) + { + return "
Please check that the field ".getFieldLabel($element)." is an integer number
\n".$this->getHiddenAlertElement($element); + } + + //if the element is not a real date + public function getNotDateResultString($element) + { + return "
Please check that the field ".getFieldLabel($element)." is a real date
\n".$this->getHiddenAlertElement($element); } //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 "
Please check that the field ".getFieldLabel($element)." does not exceed the value of $maxLength characters
\n".$this->getHiddenAlertElement($element); } //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 "
Please check that the field ".getFieldLabel($element)." is not one of the following strings: $stringList
\n".$this->getHiddenAlertElement($element); } //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 "
Please check that the field ".getFieldLabel($element)." is one of the following strings: $stringList
\n".$this->getHiddenAlertElement($element); } - //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 "
Please check that the field ".getFieldLabel($element)." matchs the following regular expression: $regExp
\n".$this->getHiddenAlertElement($element); + } + + //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 "
Please check that the field ".getFieldLabel($element)." is a decimal number (maximum number of integer digits:$I, maximum number of decimal digits: $D)
\n".$this->getHiddenAlertElement($element); } } -- cgit v1.2.3