'. t('This page allows you to send an email message to every user who signed up for this %node_type.', array('%node_type' => node_get_types('name', $node->type))) .'
'; + return ''. t('This page allows you to send an email message to every user who signed up for this %node_type.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)))) .'
'; case 'add': - return ''. t('This page allows you to sign up another user for this %node_type.', array('%node_type' => node_get_types('name', $node->type))) .'
'; + return ''. t('This page allows you to sign up another user for this %node_type.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)))) .'
'; } } @@ -1239,8 +1239,8 @@ function signup_sign_up_user($signup_for // Figure out if confirmation or reminder emails will be sent and // inform the user. - $confirmation_email = $node->signup_send_confirmation ? ' '. t('A confirmation email will be sent shortly containing further information about this %node_type.', array('%node_type' => node_get_types('name', $node->type))) : ''; - $reminder_email = $node->signup_send_reminder ? ' '. t('A reminder email will be sent !number !days before the %node_type.', array('!number' => $node->signup_reminder_days_before, '!days' => format_plural($node->signup_reminder_days_before, 'day', 'days'), '%node_type' => node_get_types('name', $node->type))) : ''; + $confirmation_email = $node->signup_send_confirmation ? ' '. t('A confirmation email will be sent shortly containing further information about this %node_type.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)))) : ''; + $reminder_email = $node->signup_send_reminder ? ' '. t('A reminder email will be sent !number !days before the %node_type.', array('!number' => $node->signup_reminder_days_before, '!days' => format_plural($node->signup_reminder_days_before, 'day', 'days'), '%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)))) : ''; // Construct the appropriate $signup object representing this signup. $signup = new stdClass; @@ -1320,7 +1320,7 @@ function signup_send_confirmation_mail($ } $node_type_name = node_get_types('name', $node->type); $params = array( - 'subject' => t('Signup confirmation for !node_type: !title', array('!node_type' => $node_type_name, '!title' => $node->title)), + 'subject' => t('Signup confirmation for !node_type: !title', array('!node_type' => signup_tt("nodetype:type:$node->type:name", $node_type_name), '!title' => $node->title)), 'body' => $node->signup_confirmation_email, 'node' => $node, 'signup' => $signup, @@ -1376,7 +1376,7 @@ function signup_send_forwarding_mail($si $node_type_name = node_get_types('name', $node->type); $from = variable_get('site_mail', ini_get('sendmail_from')); $params = array( - 'subject' => t('Signup confirmation for !node_type: !title', array('!node_type' => $node_type_name, '!title' => $node->title)), + 'subject' => t('Signup confirmation for !node_type: !title', array('!node_type' => signup_tt("nodetype:type:$node->type:name", $node_type_name), '!title' => $node->title)), 'body' => $message, 'node' => $node, 'signup' => $signup, @@ -1762,3 +1762,15 @@ function signup_token_values($type = 'al } return $values; } + +/** + * Wrapper function for tt() if i18nstrings enabled. + */ +function signup_tt($name, $string, $langcode = NULL, $update = FALSE) { + if (module_exists('i18ncontent')) { + return tt($name, $string, $langcode, $update); + } + else { + return $string; + } +} Index: includes/broadcast.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/broadcast.inc,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 broadcast.inc --- includes/broadcast.inc 14 Aug 2009 23:26:10 -0000 1.1.2.3 +++ includes/broadcast.inc 19 Nov 2009 07:16:40 -0000 @@ -17,7 +17,7 @@ function signup_broadcast_form($form_sta $signups = signup_get_signups($node->nid); if (empty($signups)) { $form['no_users'] = array( - '#value' => t('No users have signup up for this %node_type.', array('%node_type' => node_get_types('name', $node->type))), + '#value' => t('No users have signup up for this %node_type.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)))), ); return $form; } @@ -42,7 +42,7 @@ function signup_broadcast_form($form_sta '#type' => 'textarea', '#title' => t('Message body'), '#required' => TRUE, - '#description' => t('Body of the email message you wish to send to all users who have signed up for this %node_type. !token_description', array('%node_type' => node_get_types('name', $node->type), '!token_description' => $token_text)), + '#description' => t('Body of the email message you wish to send to all users who have signed up for this %node_type. !token_description', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)), '!token_description' => $token_text)), '#rows' => 10, ); Index: includes/cron.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/cron.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 cron.inc --- includes/cron.inc 14 Aug 2009 23:26:10 -0000 1.1.2.2 +++ includes/cron.inc 19 Nov 2009 07:16:40 -0000 @@ -48,7 +48,7 @@ function _signup_cron_send_reminders() { // Grab each node, construct the email header and subject, and query // the signup log to pull all users who are signed up for this node. while ($node = db_fetch_object($result)) { - $subject = t('!node_type reminder: !title', array('!node_type' => node_get_types('name', $type), '!title' => $node->title)); + $subject = t('!node_type reminder: !title', array('!node_type' => signup_tt("nodetype:type:$type:name", node_get_types('name', $type)), '!title' => $node->title)); $signups = db_query("SELECT u.name, u.mail, s_l.sid, s_l.anon_mail, s_l.form_data FROM {signup_log} s_l INNER JOIN {users} u ON u.uid = s_l.uid WHERE s_l.nid = %d", $node->nid); // Loop through the users, composing their customized message Index: includes/date.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/date.inc,v retrieving revision 1.16.2.4 diff -u -p -r1.16.2.4 date.inc --- includes/date.inc 4 Mar 2009 19:19:34 -0000 1.16.2.4 +++ includes/date.inc 19 Nov 2009 07:16:40 -0000 @@ -245,7 +245,7 @@ function signup_date_field_check_config( if ($signup_date_field != 'none') { $type_url = str_replace('_', '-', $type); $placeholders = array( - '%node_type' => $name, + '%node_type' => signup_tt("nodetype:type:$type:name", $name), '%signup_date_field' => t('Date field to use with signup'), '@type_admin_url' => url('admin/content/node-type/'. $type_url), '@type_add_field_url' => url('admin/content/node-type/'. $type_url .'/fields'), Index: includes/node_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/node_admin.inc,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 node_admin.inc --- includes/node_admin.inc 14 Jan 2009 18:11:21 -0000 1.1.2.5 +++ includes/node_admin.inc 19 Nov 2009 07:16:40 -0000 @@ -88,7 +88,7 @@ function signup_node_admin_details_form( $form['attended'][$key] = array('#value' => theme('signup_attended_text', $signed_up_user->attended)); } if (empty($users)) { - $form['no_users'] = array('#value' => t('No users have signed up for this %node_type.', array('%node_type' => node_get_types('name', $node->type)))); + $form['no_users'] = array('#value' => t('No users have signed up for this %node_type.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type))))); } else { $form['nid'] = array( Index: includes/node_form.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/node_form.inc,v retrieving revision 1.4.2.2 diff -u -p -r1.4.2.2 node_form.inc --- includes/node_form.inc 16 Sep 2009 00:42:57 -0000 1.4.2.2 +++ includes/node_form.inc 19 Nov 2009 07:16:40 -0000 @@ -76,7 +76,7 @@ function signup_save_node($node, $op) { // advance time (e.g. someone just changed the node start time), and // signups are still open, close them now. signup_close_signup($node->nid); - drupal_set_message(t('%node_type start time is already past the signup close-in-advance time, signups now closed.', array('%node_type' => node_get_types('name', $node->type)))); + drupal_set_message(t('%node_type start time is already past the signup close-in-advance time, signups now closed.', array('%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type))))); } } @@ -147,7 +147,7 @@ function signup_alter_node_form(&$form, '#type' => 'radios', '#options' => $radio_options, '#default_value' => $default_option, - '#description' => t('If enabled, you can control whether users may sign up by visiting the !signup_admin tab and toggling if signups are %open or %closed for this %node_type. Other signup-related settings can be defined at the !signup_settings tab.', array('!signup_admin' => !empty($node->signup) ? l(t('Signups: Administer'), 'node/'. $node->nid .'/signups/admin') : theme('placeholder', t('Signups: Administer')), '!signup_settings' => !empty($node->signup) ? l(t('Signups: Settings'), 'node/'. $node->nid .'/signups/settings') : theme('placeholder', t('Signups: Settings')), '%open' => t('open'), '%closed' => t('closed'), '%node_type' => node_get_types('name', $node_type))), + '#description' => t('If enabled, you can control whether users may sign up by visiting the !signup_admin tab and toggling if signups are %open or %closed for this %node_type. Other signup-related settings can be defined at the !signup_settings tab.', array('!signup_admin' => !empty($node->signup) ? l(t('Signups: Administer'), 'node/'. $node->nid .'/signups/admin') : theme('placeholder', t('Signups: Administer')), '!signup_settings' => !empty($node->signup) ? l(t('Signups: Settings'), 'node/'. $node->nid .'/signups/settings') : theme('placeholder', t('Signups: Settings')), '%open' => t('open'), '%closed' => t('closed'), '%node_type' => signup_tt("nodetype:type:$node_type:name", node_get_types('name', $node_type)))), ); } } Index: includes/node_output.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/node_output.inc,v retrieving revision 1.1.2.11 diff -u -p -r1.1.2.11 node_output.inc --- includes/node_output.inc 23 Aug 2009 15:44:54 -0000 1.1.2.11 +++ includes/node_output.inc 19 Nov 2009 07:16:40 -0000 @@ -74,7 +74,7 @@ function _signup_current_user_signup($no $token_array = array( '!login' => l(t('login'), 'user/login', array('query' => drupal_get_destination())), '!register' => l(t('register'), 'user/register', array('query' => drupal_get_destination())), - '%node_type' => node_get_types('name', $node->type), + '%node_type' => signup_tt("nodetype:type:$node->type:name", node_get_types('name', $node->type)), ); if (variable_get('user_register', 1) == 0) { $anon_login_text = t('Please !login to sign up for this %node_type.', $token_array); Index: includes/node_settings.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/includes/node_settings.inc,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 node_settings.inc --- includes/node_settings.inc 21 Sep 2009 05:23:09 -0000 1.1.2.4 +++ includes/node_settings.inc 19 Nov 2009 07:16:40 -0000 @@ -88,7 +88,7 @@ function signup_node_settings_form($form for ($i = 1; $i <= 60; $i++) { $options[$i] = $i; } - $node_type_name = isset($node_type) ? node_get_types('name', $node_type) : ''; + $node_type_name = isset($node_type) ? signup_tt("nodetype:type:$node_type:name", node_get_types('name', $node_type)) : ''; $form['signup_reminder']['signup_reminder_days_before'] = array( '#type' => 'select', '#default_value' => $node->signup_reminder_days_before, Index: theme/node.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/signup/theme/node.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 node.inc --- theme/node.inc 22 Jan 2009 19:00:55 -0000 1.1.2.2 +++ theme/node.inc 19 Nov 2009 07:16:41 -0000 @@ -23,7 +23,7 @@ * @see _signup_print_current_signup() */ function theme_signup_signups_closed($node, $current_signup = '') { - $output = '