### Eclipse Workspace Patch 1.0 #P drupal-contrib-cvs Index: modules/pathauto/pathauto.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.admin.inc,v retrieving revision 1.8 diff -u -r1.8 pathauto.admin.inc --- modules/pathauto/pathauto.admin.inc 31 May 2008 07:03:06 -0000 1.8 +++ modules/pathauto/pathauto.admin.inc 3 Jun 2008 21:56:35 -0000 @@ -110,19 +110,19 @@ '#title' => t('Update action'), '#default_value' => variable_get('pathauto_update_action', 2), '#options' => $actions, - '#description' => t('What should pathauto do when updating an existing content item which already has an alias?'), + '#description' => t('What should Pathauto do when updating an existing content item which already has an alias?'), ); $disable_transliteration = TRUE; $path = drupal_get_path('module', 'pathauto'); - $transliteration_help = t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the ASCII-96 alphabet? Transliteration is determined by the i18n-ascii.txt file in the Pathauto directory. This option is disabled on your site because you do not have an i18n-ascii.txt file in the Pathauto directory.'); + $transliteration_help = t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the ASCII-96 alphabet? Transliteration is determined by the i18n-ascii.txt file in the Pathauto directory.'); if (is_file($path .'/i18n-ascii.txt')) { $disable_transliteration = FALSE; - $transliteration_help = t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the ASCII-96 alphabet? Transliteration is determined by the i18n-ascii.txt file in the Pathauto directory.'); } else { // Perhaps they've removed the file, set the transliterate option to FALSE variable_set('pathauto_transliterate', FALSE); + $transliteration_help .= ' '. t('This option is disabled on your site because you do not have an i18n-ascii.txt file in the Pathauto directory.') .''; } $form['general']['pathauto_transliterate'] = array( '#type' => 'checkbox', @@ -347,10 +347,7 @@ } if ($return) { - $description = t('NOTE: This field contains potentially incorrect patterns. '); - $description .= format_plural(count($return), 'Problem token: ', 'Problem tokens: '); - $description .= t('%problems', array('%problems' => implode(', ', $return))); - $return = $description; + $return = t('NOTE: This field contains potentially incorrect patterns. %name %problems.', array('%name' => format_plural(count($return), 'Problem token:', 'Problem tokens:'), '%problems' => implode(', ', $return)); } return $return; @@ -368,7 +365,7 @@ if ($details['value'] == $separator) { $action = $form_state['values']['pathauto_punctuation_'. $name]; if ($action == 0) { - drupal_set_message(t('You have configured the @name to be the separator and to be removed when encountered in strings. This can cause problems with your patterns and especially with the catpath and termpath patterns. You should probably set the action for @name to be "replace by separator"', array('@name' => $details['name'])), 'error'); + drupal_set_message(t('You have configured the @name to be the separator and to be removed when encountered in strings. This can cause problems with your patterns and especially with the catpath and termpath patterns. You should probably set the action for @name to be "replace by separator".', array('@name' => $details['name'])), 'error'); } } } @@ -393,7 +390,7 @@ $form = array(); $form['delete'] = array( '#type' => 'fieldset', - '#title' => t('Choose Aliases to Delete'), + '#title' => t('Choose aliases to delete'), '#collapsible' => FALSE, '#collapsed' => FALSE, ); @@ -402,7 +399,7 @@ $total_count = db_result(db_query('SELECT count(1) FROM {url_alias}')); $form['delete']['all_aliases'] = array( '#type' => 'checkbox', - '#title' => t('all aliases'), + '#title' => t('All aliases'), '#default_value' => FALSE, '#description' => t('Delete all aliases. Number of aliases which will be deleted: %count.', array('%count' => $total_count)), ); @@ -420,7 +417,7 @@ } // Warn them and give a button that shows we mean business - $form['warning'] = array('#value' => t('

Note: there is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.
You may want to make a backup of the database and/or the url_alias table prior to using this feature.

')); + $form['warning'] = array('#value' => '

'. t('Note: There is no confirmation. Be sure of your action before clicking the "Delete aliases now!" button.
You may want to make a backup of the database and/or the url_alias table prior to using this feature.') .'

'); $form['buttons']['submit'] = array( '#type' => 'submit', '#value' => t('Delete aliases now!'), Index: modules/pathauto/pathauto.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v retrieving revision 1.112 diff -u -r1.112 pathauto.module --- modules/pathauto/pathauto.module 2 Jun 2008 18:55:12 -0000 1.112 +++ modules/pathauto/pathauto.module 3 Jun 2008 21:56:36 -0000 @@ -24,20 +24,10 @@ function pathauto_help($path, $arg) { switch ($path) { case 'admin/help#pathauto': - $output = t('

Provides a mechanism for modules to automatically generate aliases for the content they manage.

-

Settings

-

The Maximum Alias Length and Maximum component length values - default to 100 and have a limit of 128 from pathauto. This length is limited by the length of the dst - column of the url_alias database table. The default database schema for this column is 128. If you - set a length that is equal to that of the one set in the dst column it will cause problems in situations - where the system needs to append additional words to the aliased URL. For example... URLs generated - for feeds will have "/feed" added to the end. You should enter a value that is the length of the dst - column minus the length of any strings that might get added to the end of the URL. The length of - strings that might get added to the end of your URLs depends on which modules you have enabled and - on your Pathauto settings. The recommended and default value is 100.

-

Raw Tokens In Pathauto it is appropriate to use the -raw form of tokens. Paths are - sent through a filtering system which ensures that raw user content is filtered. Failure to use -raw - tokens can cause problems with the Pathauto punctuation filtering system.

'); + $output = '

'. t('Provides a mechanism for modules to automatically generate aliases for the content they manage.') .'

'; + $output .= '

'. t('Settings') .'

'; + $output .= '

'. t('The maximum alias length and maximum component length values default to 100 and have a limit of 128 from pathauto. This length is limited by the length of the "dst" column of the url_alias database table. The default database schema for this column is 128. If you set a length that is equal to that of the one set in the "dst" column it will cause problems in situations where the system needs to append additional words to the aliased URL. For example... URLs generated for feeds will have "/feed" added to the end. You should enter a value that is the length of the "dst" column minus the length of any strings that might get added to the end of the URL. The length of strings that might get added to the end of your URLs depends on which modules you have enabled and on your Pathauto settings. The recommended and default value is 100.') .'

'; + $output .= '

'. t('Raw tokens: In Pathauto it is appropriate to use the -raw form of tokens. Paths are sent through a filtering system which ensures that raw user content is filtered. Failure to use -raw tokens can cause problems with the Pathauto punctuation filtering system.') .'

'; return $output; } } @@ -180,18 +170,18 @@ * Used primarily by the bulk delete form. */ function pathauto_path_alias_types() { - $objects = array('user/' => t('users'), 'node/' => t('content')); + $objects = array('user/' => t('Users'), 'node/' => t('Content')); if (module_exists('blog')) { - $objects['blog/'] = t('user blogs'); + $objects['blog/'] = t('User blogs'); } if (module_exists('taxonomy')) { - $objects['taxonomy/'] = t('vocabularies and terms'); + $objects['taxonomy/'] = t('Vocabularies and terms'); } if (module_exists('taxonomy')) { - $objects['user/%/track'] = t('user trackers'); + $objects['user/%/track'] = t('User trackers'); } if (module_exists('forum')) { - $objects['forum/%'] = t('forums'); + $objects['forum/%'] = t('Forums'); } return $objects; @@ -277,7 +267,7 @@ if ($pattern && user_access('create url aliases') && isset($form['path']['path'])) { $output = t('An alias will be generated for you. If you wish to create your own alias below, untick this option.'); if (user_access('administer pathauto')) { - $output .= t(' To control the format of the generated aliases, see the Pathauto settings.', array('@pathauto' => url('admin/build/path/pathauto'))); + $output .= ' '. t('To control the format of the generated aliases, see the Pathauto settings.', array('@pathauto' => url('admin/build/path/pathauto'))); } drupal_add_js(drupal_get_path('module', 'pathauto') .'/pathauto.js'); @@ -388,7 +378,7 @@ if (module_exists('blog')) { $new_user = $user; $new_user->roles = isset($edit['roles']) ? $edit['roles']: array(); - $new_user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; // Add this back + $new_user->roles[DRUPAL_AUTHENTICATED_RID] = t('authenticated user'); // Add this back if (user_access('create blog entries', $new_user)) { $src = 'blog/'. $user->uid; $alias = pathauto_create_alias('blog', $op, $placeholders, $src, $user->uid); Index: modules/pathauto/pathauto.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v retrieving revision 1.42 diff -u -r1.42 pathauto.inc --- modules/pathauto/pathauto.inc 30 May 2008 00:47:59 -0000 1.42 +++ modules/pathauto/pathauto.inc 3 Jun 2008 21:56:36 -0000 @@ -406,13 +406,13 @@ } if ($verbose and user_access('notify of path changes')) { if (isset($redirect) && $redirect) { - drupal_set_message(t('Created new alias %dst for %src, replacing %old_alias. %old_alias now redirects to %dst', array('%dst' => $dst, '%src' => $src, '%old_alias' => $old_alias))); + drupal_set_message(t('Created new alias %dst for %src, replacing %old_alias. %old_alias now redirects to %dst.', array('%dst' => $dst, '%src' => $src, '%old_alias' => $old_alias))); } elseif ($pid) { - drupal_set_message(t('Created new alias %dst for %src, replacing %old_alias', array('%dst' => $dst, '%src' => $src, '%old_alias' => $old_alias))); + drupal_set_message(t('Created new alias %dst for %src, replacing %old_alias.', array('%dst' => $dst, '%src' => $src, '%old_alias' => $old_alias))); } else { - drupal_set_message(t('Created new alias %dst for %src', array('%dst' => $dst, '%src' => $src))); + drupal_set_message(t('Created new alias %dst for %src.', array('%dst' => $dst, '%src' => $src))); } } } @@ -435,7 +435,7 @@ return array('tokens' => $tokens, 'values' => $values); } // TODO at some point try removing this and see if install profiles have problems again. - watchdog('Pathauto', 'It appears that you have installed Pathauto, which depends on token, but token is either not installed or not installed properly.'); + watchdog('Pathauto', 'It appears that you have installed Pathauto, which depends on Token, but Token is either not installed or not installed properly.'); return array('tokens' => array(), 'values' => array()); }