------------ sites/all/modules/mailchimp/mailchimp.module ------------ diff --git a/sites/all/modules/mailchimp/mailchimp.module b/sites/all/modules/mailchimp/mailchimp.module index 7cb29a6..756a6d6 100644 --- a/sites/all/modules/mailchimp/mailchimp.module +++ b/sites/all/modules/mailchimp/mailchimp.module @@ -44,7 +44,7 @@ $items['admin/config/services/mailchimp'] = array( 'title' => 'MailChimp', - 'description' => 'Manage MailChimp Settings.', + 'description' => t('Manage MailChimp Settings.'), 'page callback' => 'drupal_get_form', 'page arguments' => array('mailchimp_admin_settings'), 'access arguments' => array('administer mailchimp'), @@ -52,7 +52,7 @@ 'type' => MENU_NORMAL_ITEM, ); $items['admin/config/services/mailchimp/global'] = array( - 'title' => 'Global Settings', + 'title' => t('Global Settings'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); @@ -126,7 +126,7 @@ $api_key = variable_get('mailchimp_api_key', ''); if (!strlen($api_key)) { - watchdog('mailchimp', 'Mailchimp Error: API Key cannot be blank.', array(), WATCHDOG_ERROR); + watchdog('mailchimp', t('Mailchimp Error: API Key cannot be blank.'), array(), WATCHDOG_ERROR); return NULL; } // Set the timeout to something that won't take down the Drupal site: @@ -948,7 +948,7 @@ $result = $mcapi->lists->webhookAdd($list_id, $url, $actions, $sources); } catch (Exception $e) { - watchdog('mailchimp', 'An error occurred adding webhook for list @list. "%message"', array( + watchdog('mailchimp', t('An error occurred adding webhook for list @list. "%message"'), array( '@list' => $list_id, '%message' => $e->getMessage(), ), WATCHDOG_ERROR); sites/all/modules/mailchimp/modules/mailchimp_activity/mailchimp_activity.install diff --git a/sites/all/modules/mailchimp/modules/mailchimp_activity/mailchimp_activity.install b/sites/all/modules/mailchimp/modules/mailchimp_activity/mailchimp_activity.install index d7c22f9..1b368ea 100644 --- a/sites/all/modules/mailchimp/modules/mailchimp_activity/mailchimp_activity.install +++ b/sites/all/modules/mailchimp/modules/mailchimp_activity/mailchimp_activity.install @@ -11,48 +11,48 @@ function mailchimp_activity_schema() { $schema['mailchimp_activity_entity'] = array( - 'description' => 'MailChimp activity enabled entities.', + 'description' => t('MailChimp activity enabled entities.'), 'fields' => array( 'mailchimp_activity_entity_id' => array( 'type' => 'serial', 'not null' => TRUE, - 'description' => 'Primary Key: Unique mailchimp_activity_entity entity ID.', + 'description' => t('Primary Key: Unique mailchimp_activity_entity entity ID.'), ), 'name' => array( - 'description' => 'The machine-readable name of this mailchimp_activity_entity.', + 'description' => t('The machine-readable name of this mailchimp_activity_entity.'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, ), 'label' => array( - 'description' => 'The human-readable name of this mailchimp_activity_entity.', + 'description' => t('The human-readable name of this mailchimp_activity_entity.'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, ), 'entity_type' => array( - 'description' => 'The Drupal entity type (e.g. "node", "user").', + 'description' => t('The Drupal entity type (e.g. "node", "user").'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '', ), 'bundle' => array( - 'description' => 'The Drupal bundle (e.g. "page", "user")', + 'description' => t('The Drupal bundle (e.g. "page", "user")'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '', ), 'entity_path' => array( - 'description' => 'The path to view individual entities of the selected type.', + 'description' => t('The path to view individual entities of the selected type.'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '', ), 'email_property' => array( - 'description' => 'The property that contains the email address to track', + 'description' => t('The property that contains the email address to track'), 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, @@ -63,11 +63,11 @@ 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', - 'description' => 'Whether or not this mailchimp activity stream is enabled.', + 'description' => t('Whether or not this mailchimp activity stream is enabled.'), ), // The following fields are for supporting exportable status. 'locked' => array( - 'description' => 'A boolean indicating whether the administrator may delete this mapping.', + 'description' => t('A boolean indicating whether the administrator may delete this mapping.'), 'type' => 'int', 'not null' => TRUE, 'default' => 0, @@ -80,10 +80,10 @@ // not safe to use it at this point. 'default' => 0x01, 'size' => 'tiny', - 'description' => 'The exportable status of the entity.', + 'description' => t('The exportable status of the entity.'), ), 'module' => array( - 'description' => 'The name of the providing module if the entity has been defined in code.', + 'description' => t('The name of the providing module if the entity has been defined in code.'), 'type' => 'varchar', 'length' => 255, 'not null' => FALSE, sites/all/modules/mailchimp/modules/mailchimp_lists/includes/mailchimp_lists.admin.inc diff --git a/sites/all/modules/mailchimp/modules/mailchimp_lists/includes/mailchimp_lists.admin.inc b/sites/all/modules/mailchimp/modules/mailchimp_lists/includes/mailchimp_lists.admin.inc index 7571922..785f3f5 100644 --- a/sites/all/modules/mailchimp/modules/mailchimp_lists/includes/mailchimp_lists.admin.inc +++ b/sites/all/modules/mailchimp/modules/mailchimp_lists/includes/mailchimp_lists.admin.inc @@ -25,10 +25,10 @@ } if ($enabled) { // This is a webhook for this Mailchimp Module. - $webhook_status = "ENABLED (" . l(t('disable'), 'admin/config/services/mailchimp/lists/' . $mc_list['id'] . '/webhook/disable') . ')'; + $webhook_status = t('ENABLED') . '(' . l(t('disable'), 'admin/config/services/mailchimp/lists/' . $mc_list['id'] . '/webhook/disable') . ')'; } else { - $webhook_status = "disabled (" . l(t('enable'), 'admin/config/services/mailchimp/lists/' . $mc_list['id'] . '/webhook/enable') . ')'; + $webhook_status = t('disabled') . ' (' . l(t('enable'), 'admin/config/services/mailchimp/lists/' . $mc_list['id'] . '/webhook/enable') . ')'; } $rows[] = array( l($mc_list['name'], 'https://admin.mailchimp.com/lists/dashboard/overview?id=' . $mc_list['web_id']), @@ -54,7 +54,7 @@ array('!link' => l(t('MailChimp'), 'https://admin.mailchimp.com/lists/'))), 'warning'); } else { - $options = 'Currently Available MailChimp lists:'; + $options = t('Currently Available MailChimp lists').':'; foreach ($mc_lists as $mc_list) { $options .= ' ' . $mc_list['name'] . ','; } @@ -126,11 +126,11 @@ default: return array(); } - $label = $action . " webhooks"; + $label = t($action) . " webhooks"; return confirm_form($form, t('Are you sure you want to &action webhooks for %name?', array( - '&action' => $action, + '&action' => t($action), '%name' => $list['name'], )), 'admin/config/services/mailchimp/lists', sites/all/modules/mailchimp/modules/mailchimp_signup/includes/mailchimp_signup.admin.inc diff --git a/sites/all/modules/mailchimp/modules/mailchimp_signup/includes/mailchimp_signup.admin.inc b/sites/all/modules/mailchimp/modules/mailchimp_signup/includes/mailchimp_signup.admin.inc index fc31e7e..30ad621 100644 --- a/sites/all/modules/mailchimp/modules/mailchimp_signup/includes/mailchimp_signup.admin.inc +++ b/sites/all/modules/mailchimp/modules/mailchimp_signup/includes/mailchimp_signup.admin.inc @@ -37,7 +37,7 @@ ); $form['description'] = array( '#type' => 'textarea', - '#title' => t('Description'), + '#title' => 'Description', '#default_value' => isset($signup->settings['description']) ? $signup->settings['description'] : '', '#rows' => 2, '#maxlength' => 500, @@ -69,7 +69,7 @@ $form['settings']['path'] = array( '#type' => 'textfield', - '#title' => t('Page URL'), + '#title' => 'Page URL', '#description' => t('Path to the signup page. ie "newsletter/signup".'), '#default_value' => isset($signup->settings['path']) ? $signup->settings['path'] : NULL, '#states' => array(