diff --git a/booking.travel.inc b/booking.travel.inc index 7315b1c..3a325f2 100644 --- a/booking.travel.inc +++ b/booking.travel.inc @@ -364,7 +364,10 @@ function travel_form_validate($form, &$form_state) { if (isset($form_state['values']['booking_bf_gf_nid']) && $form_state['values']['booking_bf_gf_nid'] != '') { //make sure this is a node id not something else if (!is_numeric($form_state['values']['booking_bf_gf_nid'])) { - form_set_error('booking_bf_gf_nid', t('You have entered an invalid registration id for your boyfriend/girlfriend. ' . 'Please ensure you are using only the registration reference number your boyfriend/girlfriend received via email. For example, your registration ID is !id. ' . 'If you believe this to be incorrect, please !contact using the details provided.', array( + form_set_error('booking_bf_gf_nid', t('You have entered an invalid registration id for your boyfriend/girlfriend. ' . + 'Please ensure you are using only the registration reference number your boyfriend/girlfriend received via email. For example, your registration ID is !id. ' . + 'If you believe this to be incorrect, please !contact using the details provided.', + array( '!id' => $form_state['values']['personid'], '!contact' => l('contact us', 'contact') ))); @@ -374,7 +377,8 @@ function travel_form_validate($form, &$form_state) { } //don't allow them to specify their own node id elseif ($form_state['values']['personid'] == $form_state['values']['booking_bf_gf_nid']) { - form_set_error('booking_bf_gf_nid', t('You have entered your own registration id.' . 'Please ensure you enter only the registration reference number your boyfriend/girlfriend received via email when registering, not your own registration id.')); + form_set_error('booking_bf_gf_nid', t('You have entered your own registration id. ' . + 'Please ensure you enter only the registration reference number your boyfriend/girlfriend received via email when registering, not your own registration id.')); watchdog('booking', "
Travel form bf/gf same as person id\n@info", array( '@info' => print_r($form_state['values'], true) )); @@ -384,7 +388,10 @@ function travel_form_validate($form, &$form_state) { ':nid' => $form_state['values']['booking_bf_gf_nid'] ))->fetchObject(); if (!$partner) { - form_set_error('booking_bf_gf_nid', t('We cannot find a matching registration id for your boyfriend/girlfriend. ' . 'Please ensure you are using only the number that relates to their registration. For example, your registration ID is !id. ' . 'If you believe this to be incorrect, please !contact using the details provided.', array( + form_set_error('booking_bf_gf_nid', t('We cannot find a matching registration id for your boyfriend/girlfriend. ' . + 'Please ensure you are using only the number that relates to their registration. For example, your registration ID is !id. ' . + 'If you believe this to be incorrect, please !contact using the details provided.', + array( '!id' => $form_state['values']['personid'], '!contact' => l('contact us', 'contact') )));