Index: activity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.module,v
retrieving revision 1.1.2.2.2.30.2.27
diff -b -u -p -r1.1.2.2.2.30.2.27 activity.module
--- activity.module	20 Jan 2009 17:43:03 -0000	1.1.2.2.2.30.2.27
+++ activity.module	23 Feb 2009 05:59:09 -0000
@@ -143,8 +143,7 @@ function activity_aid_load($aid) {
  * activity settings.
  */
 function _activity_menu_title($module) {
-  $module_nice_name = drupal_ucfirst(str_replace('_', ' ', substr($module, 0, -8)));
-  return $module_nice_name .' Module Activity Settings';
+  return drupal_ucfirst($module) .' Module Activity Settings';
 }
 
 /**
@@ -202,10 +201,9 @@ function activity_admin_settings() {
 
     foreach ($activity_info as $module => $info) {
       if (!empty($info)) {
-        $module_nice_name = drupal_ucfirst(str_replace('_', ' ', substr($module, 0, -8)));
         $form['module_settings'][$module] = array(
           '#type' => 'markup',
-          '#value' => '<p>'. l($module_nice_name .' activity settings page', 'admin/settings/activity/'. $module, array('title' => 'Configure '. $module_nice_name)) .'</p>',
+          '#value' => '<p>'. l(drupal_ucfirst($module) .' settings page', 'admin/settings/activity/'. $module, array('title' => 'Configure '. drupal_ucfirst($module))) .'</p>',
         );
       }
     }
@@ -222,8 +220,7 @@ function activity_admin_settings() {
 function activity_module_settings(&$form_state, $module) {
   drupal_add_js(drupal_get_path('module', 'activity') .'/activity_admin.js');
 
-  $module_nice_name = drupal_ucfirst(str_replace('_', ' ', substr($module, 0, -8)));
-  $module_help = t('<p>The configuration settings below determine how activity generated by the <strong><em>@module</em></strong> module is recorded. Select which types of activity and which operations to record by checking/unchecking the options for <strong>Token Types</strong> and <strong>Operation Types</strong>. You can customize the text that is displayed on an activity record by changing the text in the fields below for each combination of token type and operation type and role.</p>', array('@module' => $module_nice_name));
+  $module_help = t('<p>The configuration settings below determine how activity generated by the <strong><em>@module</em></strong> module is recorded. Select which types of activity and which operations to record by checking/unchecking the options for <strong>Token Types</strong> and <strong>Operation Types</strong>. You can customize the text that is displayed on an activity record by changing the text in the fields below for each combination of token type and operation type and role.</p>', array('@module' => drupal_ucfirst($module)));
   $form['help'] = array(
     '#type' => 'markup',
     '#value' => $module_help,
@@ -270,7 +267,7 @@ function activity_module_settings(&$form
       
       $form['token_settings'] = array(
         '#type' => 'fieldset',
-        '#title' => t('Tokens available to @name activity', array('@name' => t($module_nice_name))),
+        '#title' => t('Tokens available to @module', array('@module' => drupal_ucfirst($module))),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
         '#description' => t('Available tokens') . theme('item_list', $tokens),