| @@ -1,22 +1,10 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | class AccuaForm_Element_Email extends Element_Textbox { |
| 3 | - public function __construct($label, $name, ?array $properties = null) { | |
| 4 | - // Extract custom format message before parent constructor | |
| 5 | - $custom_format_message = ''; | |
| 6 | - if (isset($properties['custom_format_message'])) { | |
| 7 | - $custom_format_message = $properties['custom_format_message']; | |
| 8 | - unset($properties['custom_format_message']); | |
| 9 | - } | |
| 10 | - | |
| 3 | + public function __construct($label, $name, array $properties = null) { | |
| 11 | 4 | parent::__construct($label,$name,$properties); |
| 12 | 5 | $this->attributes['type'] = 'email'; |
| 13 | - | |
| 14 | - if ($custom_format_message !== '') { | |
| 15 | - $email_error_msg = str_replace(array('%s', '%element%'), $label, $custom_format_message); | |
| 16 | - } else { | |
| 17 | - // translators: %element% is the field label. | |
| 18 | - $email_error_msg = str_replace('%element%', $label, __( "Attention: '%element%' must contain an email address.", 'contact-forms' )); | |
| 19 | - } | |
| 20 | - $this->setValidation(new Validation_Email($email_error_msg)); | |
| 6 | + $this->setValidation(new Validation_Email( | |
| 7 | + str_replace('%element%', $label, __("Attention: '%element%' must contain an email address.", 'contact-forms')) | |
| 8 | + )); | |
| 21 | 9 | } |
| 22 | 10 | } |