diff --git a/dictionaries/cs.dictionary.itop.core.php b/dictionaries/cs.dictionary.itop.core.php index f02dafe73..88ce00a65 100755 --- a/dictionaries/cs.dictionary.itop.core.php +++ b/dictionaries/cs.dictionary.itop.core.php @@ -867,5 +867,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~', 'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', - 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php index 64ea675ea..2d5fc3104 100644 --- a/dictionaries/da.dictionary.itop.core.php +++ b/dictionaries/da.dictionary.itop.core.php @@ -2489,5 +2489,9 @@ Operators:
'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> \ No newline at end of file diff --git a/dictionaries/de.dictionary.itop.core.php b/dictionaries/de.dictionary.itop.core.php index 8351f9a3a..c3f5c480a 100644 --- a/dictionaries/de.dictionary.itop.core.php +++ b/dictionaries/de.dictionary.itop.core.php @@ -624,4 +624,8 @@ Operatoren:
'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase) 'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59 'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59 + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php index e81fd65f0..77a51e436 100644 --- a/dictionaries/dictionary.itop.core.php +++ b/dictionaries/dictionary.itop.core.php @@ -870,4 +870,8 @@ Dict::Add('EN US', 'English', 'English', array( 'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase) 'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59 'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59 + 'Core:Validator:Default' => 'Wrong format', + 'Core:Validator:Mandatory' => 'Please, fill this field', + 'Core:Validator:MustBeInteger' => 'Must be an integer', + 'Core:Validator:MustSelectOne' => 'Please, select one', )); diff --git a/dictionaries/es_cr.dictionary.itop.core.php b/dictionaries/es_cr.dictionary.itop.core.php index c8b5e2d1b..4600460c6 100644 --- a/dictionaries/es_cr.dictionary.itop.core.php +++ b/dictionaries/es_cr.dictionary.itop.core.php @@ -847,6 +847,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> \ No newline at end of file diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index e7b584a87..9167e34b7 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -732,4 +732,8 @@ Opérateurs :
'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~', 'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~', 'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~', + 'Core:Validator:Default' => 'Format incorrect', + 'Core:Validator:Mandatory' => 'Veuillez remplir ce champ', + 'Core:Validator:MustBeInteger' => 'Ce champ ne peut contenir qu\'un nombre entier', + 'Core:Validator:MustSelectOne' => 'Veuillez choisir une valeur', )); diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php index 90e9bbbf6..458a4c564 100755 --- a/dictionaries/hu.dictionary.itop.core.php +++ b/dictionaries/hu.dictionary.itop.core.php @@ -604,5 +604,9 @@ Operators:
'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> \ No newline at end of file diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php index a0ddbb43d..f55cac516 100644 --- a/dictionaries/it.dictionary.itop.core.php +++ b/dictionaries/it.dictionary.itop.core.php @@ -850,6 +850,10 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase) 'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59 'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59 + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> diff --git a/dictionaries/ja.dictionary.itop.core.php b/dictionaries/ja.dictionary.itop.core.php index af6819c83..5535692ff 100644 --- a/dictionaries/ja.dictionary.itop.core.php +++ b/dictionaries/ja.dictionary.itop.core.php @@ -626,5 +626,9 @@ Operators:
'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> \ No newline at end of file diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php index 1fd1c087f..515ecc8fe 100644 --- a/dictionaries/nl.dictionary.itop.core.php +++ b/dictionaries/nl.dictionary.itop.core.php @@ -856,6 +856,10 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php index 0df7d97fb..75b0e89ab 100644 --- a/dictionaries/pt_br.dictionary.itop.core.php +++ b/dictionaries/pt_br.dictionary.itop.core.php @@ -849,6 +849,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> diff --git a/dictionaries/ru.dictionary.itop.core.php b/dictionaries/ru.dictionary.itop.core.php index 6a35f1163..a5ae7fdcc 100644 --- a/dictionaries/ru.dictionary.itop.core.php +++ b/dictionaries/ru.dictionary.itop.core.php @@ -858,6 +858,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase) 'Core:DateTime:Placeholder_i' => 'мм', // minutes, 2 digits: 00..59 'Core:DateTime:Placeholder_s' => 'сс', // seconds, 2 digits 00..59 + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); ?> diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php index 4c8a52863..8d365f631 100644 --- a/dictionaries/tr.dictionary.itop.core.php +++ b/dictionaries/tr.dictionary.itop.core.php @@ -776,6 +776,10 @@ Operators:
'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); diff --git a/dictionaries/zh.dictionary.itop.core.php b/dictionaries/zh.dictionary.itop.core.php index 66c9382a8..5ecebe507 100644 --- a/dictionaries/zh.dictionary.itop.core.php +++ b/dictionaries/zh.dictionary.itop.core.php @@ -775,6 +775,10 @@ Operators:
'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~', 'Core:BulkExport:XLSXOptions' => 'Excel Options~~', 'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~', + 'Core:Validator:Default' => 'Wrong format~~', + 'Core:Validator:Mandatory' => 'Please, fill this field~~', + 'Core:Validator:MustBeInteger' => 'Must be an integer~~', + 'Core:Validator:MustSelectOne' => 'Please, select one~~', )); diff --git a/sources/form/field/passwordfield.class.inc.php b/sources/form/field/passwordfield.class.inc.php new file mode 100644 index 000000000..8fa343a33 --- /dev/null +++ b/sources/form/field/passwordfield.class.inc.php @@ -0,0 +1,32 @@ + + +namespace Combodo\iTop\Form\Field; + +use \Combodo\iTop\Form\Field\TextField; + +/** + * Description of PasswordField + * + * @author Guillaume Lajarige + */ +class PasswordField extends TextField +{ + +} diff --git a/sources/form/validator/integervalidator.class.inc.php b/sources/form/validator/integervalidator.class.inc.php index 3effa2522..279217d4a 100644 --- a/sources/form/validator/integervalidator.class.inc.php +++ b/sources/form/validator/integervalidator.class.inc.php @@ -30,6 +30,6 @@ class IntegerValidator extends Validator { const VALIDATOR_NAME = 'integer'; const DEFAULT_REGEXP = '^[0-9]+$'; - const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST NOT BE AN INTEGER MESSAGE'; + const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustBeInteger'; } diff --git a/sources/form/validator/mandatoryvalidator.class.inc.php b/sources/form/validator/mandatoryvalidator.class.inc.php index 91c9a4af6..c1d4e4e4c 100644 --- a/sources/form/validator/mandatoryvalidator.class.inc.php +++ b/sources/form/validator/mandatoryvalidator.class.inc.php @@ -32,6 +32,6 @@ class MandatoryValidator extends Validator { const VALIDATOR_NAME = 'mandatory'; const DEFAULT_REGEXP = '.*\S.*'; - const DEFAULT_ERROR_MESSAGE = 'TOTR: MANDATORY MESSAGE'; + const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Mandatory'; } diff --git a/sources/form/validator/notemptyextkeyvalidator.class.inc.php b/sources/form/validator/notemptyextkeyvalidator.class.inc.php index 569b1abad..f3dde3c13 100644 --- a/sources/form/validator/notemptyextkeyvalidator.class.inc.php +++ b/sources/form/validator/notemptyextkeyvalidator.class.inc.php @@ -30,6 +30,6 @@ class NotEmptyExtKeyValidator extends Validator { const VALIDATOR_NAME = 'notemptyextkey'; const DEFAULT_REGEXP = '^[1-9]+$'; - const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST SELECT ONE'; + const DEFAULT_ERROR_MESSAGE = 'Core:Validator:MustSelectOne'; } diff --git a/sources/form/validator/validator.class.inc.php b/sources/form/validator/validator.class.inc.php index a4414db44..f76ed63f1 100644 --- a/sources/form/validator/validator.class.inc.php +++ b/sources/form/validator/validator.class.inc.php @@ -28,7 +28,7 @@ class Validator { const VALIDATOR_NAME = 'expression'; const DEFAULT_REGEXP = ''; - const DEFAULT_ERROR_MESSAGE = 'TOTR: Core:Validator:Default'; + const DEFAULT_ERROR_MESSAGE = 'Core:Validator:Default'; protected $sRegExp; protected $sErrorMessage;