Index: pathauto.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.admin.inc,v retrieving revision 1.4 diff -u -p -r1.4 pathauto.admin.inc --- pathauto.admin.inc 12 May 2008 07:39:02 -0000 1.4 +++ pathauto.admin.inc 12 May 2008 10:47:48 -0000 @@ -105,20 +105,20 @@ function pathauto_admin_settings() { '#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; $disable_text = ''; $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', @@ -334,9 +334,13 @@ function _pathauto_check_pattern($patter } 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))); + $description = t('NOTE: This field contains potentially incorrect patterns.'); + $description .= ' '. format_plural( + count($return), + 'Problem token: %problems', + 'Problem tokens: %problems', + array('%problems' => implode(', ', $return)) + ); $return = $description; } @@ -352,7 +356,7 @@ function pathauto_admin_settings_validat 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'); } } } @@ -404,7 +408,7 @@ function pathauto_admin_delete() { } // 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: pathauto.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v retrieving revision 1.34 diff -u -p -r1.34 pathauto.inc --- pathauto.inc 10 May 2008 20:48:56 -0000 1.34 +++ pathauto.inc 12 May 2008 10:47:48 -0000 @@ -384,13 +384,13 @@ function _pathauto_set_alias($src, $dst, } 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))); } } } @@ -413,7 +413,7 @@ function pathauto_get_placeholders($type 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()); } Index: pathauto.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v retrieving revision 1.107 diff -u -p -r1.107 pathauto.module --- pathauto.module 10 May 2008 20:27:59 -0000 1.107 +++ pathauto.module 12 May 2008 10:47:48 -0000 @@ -7,20 +7,22 @@ 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.

' + .'

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.

' + ); return $output; } } @@ -257,7 +259,7 @@ function pathauto_form_alter(&$form, $fo 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');