diff --git a/Source/Source.API.php b/Source/Source.API.php index c88dcc6..3b6464a 100644 --- a/Source/Source.API.php +++ b/Source/Source.API.php @@ -230,6 +230,8 @@ return; } + $t_repos = SourceRepo::load_by_changesets( $p_changesets ); + $t_resolved_threshold = config_get('bug_resolved_status_threshold'); $t_fixed_threshold = config_get('bug_resolution_fixed_threshold'); $t_notfixed_threshold = config_get('bug_resolution_not_fixed_threshold'); @@ -269,8 +271,8 @@ $t_resolution = config_get( 'plugin_Source_bugfix_resolution' ); $t_message_template = str_replace( - array( '$1', '$2', '$3', '$4' ), - array( '%1$s', '%2$s', '%3$s', '%4$s' ), + array( '$1', '$2', '$3', '$4', '$5' ), + array( '%1$s', '%2$s', '%3$s', '%4$s', '%5$s' ), config_get( 'plugin_Source_bugfix_message' ) ); $t_mappings = array(); @@ -316,7 +318,7 @@ # generate a note message if ( $t_enable_message ) { - $t_message = sprintf( $t_message_template, $t_changeset->branch, $t_changeset->revision, $t_changeset->timestamp, $t_changeset->message ); + $t_message = sprintf( $t_message_template, $t_changeset->branch, $t_changeset->revision, $t_changeset->timestamp, $t_changeset->message, $t_repos[ $t_changeset->repo_id ]->name ); } else { $t_message = ''; } diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt index 383fd71..11f662c 100644 --- a/Source/lang/strings_english.txt +++ b/Source/lang/strings_english.txt @@ -87,7 +87,7 @@ $s_plugin_Source_bugfix_regex_2 = 'Bug Fixed Regex Pass 2'; $s_plugin_Source_bugfix_resolution = 'Bug Fixed Resolution'; $s_plugin_Source_bugfix_message = 'Bug Fixed Message Template'; -$s_plugin_Source_bugfix_message_info = 'Use $1 for branch, $2 for revision, $3 for timestamp, or $4 for commit message.'; +$s_plugin_Source_bugfix_message_info = 'Use $1 for branch, $2 for revision, $3 for timestamp, $4 for commit message, or $5 for repository name.'; $s_plugin_Source_reset = 'Reset to default'; $s_plugin_Source_menu_links = 'Main Menu Links'; $s_plugin_Source_show_repo_link = 'Repositories';