Commit cda26b8f authored by Dan Chadwick's avatar Dan Chadwick
Browse files

Issue #2488930 by torotil, roball, DanChadwick: Fixed interface text translatability warnings.

parent b3a29ba1

includes/webform.report.inc

+2 −3
Changes for includes/webform.report.inc: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -351,9 +351,8 @@ function webform_results_clear_form_submit($form, &$form_state) { 
  webform_results_clear($form_state['values']['nid']);

  $node = node_load($form_state['values']['nid']);

  $title = $node->title;

  $message = t('Webform %title entries cleared.', array('%title' => $title));

  drupal_set_message($message);

  watchdog('webform', $message);

  drupal_set_message(t('Webform %title entries cleared.', array('%title' => $title)));

  watchdog('webform', 'Webform %title entries cleared.', array('%title' => $title));

  $form_state['redirect'] = 'node/' . $form_state['values']['nid'] . '/webform-results';

}

includes/webform.submissions.inc

+2 −1
Changes for includes/webform.submissions.inc: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ function webform_submission_send_mail($node, $submission, $emails = NULL) { 
    // Verify that this submission is not attempting to send any spam hacks.

    foreach ($addresses_final as $address) {

      if (_webform_submission_spam_check($address, $email['subject'], $email['from'], $email['headers'])) {

        watchdog('webform', 'Possible spam attempt from @remote_addr' . "<br />\n" . nl2br(htmlentities($email['message'])), array('@remote_add' => ip_address()));

        watchdog('webform', 'Possible spam attempt from @remote !message',

                 array('@remote' => ip_address(), '!message'=> "<br />\n" . nl2br(htmlentities($email['message']))));

        drupal_set_message(t('Illegal information. Data not submitted.'), 'error');

        return FALSE;

      }

webform.tokens.inc

+9 −7
Changes for webform.tokens.inc: 9 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -64,13 +64,15 @@ function webform_token_info() { 
  );

  $info['tokens']['submission']['values'] = array(

    'name' => t('Webform submission values'),

    'description' => t('<div>Webform tokens from submitted data. Replace the "?" with the "field key", including any parent field keys separated by colons. You can append:</div><ul>' .

                       '<li>the question key for just that one question (grid components).</li>' .

                       '<li>the option key for just that one option (grid and select components).' .

                       '<li>":nolabel" for the value without the label (the default)</li>' .

                       '<li>":label" for just the label.</li>' .

                       '<li>":withlabel" for both the label and value together.</li>' .

                       '<li>":key" for just the key in a key|label pair (grid and select components).</li></ul>'),

    'description' => '<div>' . t('Webform tokens from submitted data. Replace the "?" with the "field key", including any parent field keys separated by colons. You can append:') . '</div>' .

                     '<ul>' .

                     '<li>' . t('the question key for just that one question (grid components).') . '</li>' .

                     '<li>' . t('the option key for just that one option (grid and select components).') . '</li>' .

                     '<li>' . t('<code>@token</code> for the value without the label (the default).', array('@token' => ':no-label')) . '</li>' .

                     '<li>' . t('<code>@token</code> for just the label.', array('@token' => ':label')) . '</li>' .

                     '<li>' . t('<code>@token</code> for both the label and value together.', array('@token' => ':withlabel')) . '</li>' .

                     '<li>' . t('<code>@token</code> for just the key in a key|label pair (grid and select components).', array('@token' => ':key')) . '</li>' .

                     '</ul>',

    'dynamic' => TRUE,

  );