Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21653
Modified Files:
bug_reminder.php bug_reminder_page.php bugnote_view_inc.php
Log Message:
fir for 0004387: reminders are localized
1) eliminate the language specific stuff in the text.
2) add two fields to mantis_bugnote_table
a) note_type (INT) - kind of note, 0= bugnote, 1= reminder
b) note_attribute (VARCHAR) - additional information to go with the note.
In the case of the reminder, the list of uids the reminder was sent to.
3) fix the reminder display to use the new fields
4) add some text on the reminder send page to describe what is going to happen
with the reminder (e.g., will be added as a note to the bug, users will be
set
to monitor progress on the bug).
LOCALIZATION NOTE: 3 strings added
Index: bugnote_view_inc.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bugnote_view_inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- bugnote_view_inc.php 4 Oct 2004 15:12:11 -0000 1.21
+++ bugnote_view_inc.php 5 Oct 2004 17:20:26 -0000 1.22
@@ -153,7 +153,20 @@
</span>
</td>
<td class="<?php echo $t_bugnote_note_css ?>">
- <?php echo $v3_note ?>
+ <?php
+ switch ( $v3_note_type ) {
+ case REMINDER:
+ echo '<div class="italic">' . lang_get(
'reminder_sent_to' ) . ': ';
+ $v3_note_attr = substr( $v3_note_attr,
1, strlen( $v3_note_attr ) - 2 );
+ $t_to = array();
+ foreach ( explode( '|', $v3_note_attr )
as $t_recipient ) {
+ $t_to[] = user_get_name(
$t_recipient );
+ }
+ echo implode( ', ', $t_to ) .
'</div><br />';
+ default:
+ echo $v3_note;
+ }
+ ?>
</td>
</tr>
<tr>
Index: bug_reminder_page.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_reminder_page.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bug_reminder_page.php 27 Aug 2004 00:29:54 -0000 1.19
+++ bug_reminder_page.php 5 Oct 2004 17:20:26 -0000 1.20
@@ -65,10 +65,23 @@
</tr>
</form>
</table>
-</div>
-<?php # Send reminder Form END ?>
-</form>
+<br />
+<table class="width75" cellspacing="1">
+<tr>
+ <td>
+ <?php
+ echo lang_get( 'reminder_explain' ) . ' ';
+ if ( ON == config_get( 'reminder_recipents_monitor_bug'
) ) {
+ echo lang_get( 'reminder_monitor' ) . ' ';
+ }
+ if ( ON == config_get( 'store_reminders' ) ) {
+ echo lang_get( 'reminder_store' );
+ }
+ ?>
+ </td>
+</tr>
</table>
+</div>
<br />
<?php include( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'bug_view_inc.php'
) ?>
Index: bug_reminder.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/bug_reminder.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- bug_reminder.php 17 May 2004 11:39:06 -0000 1.15
+++ bug_reminder.php 5 Oct 2004 17:20:25 -0000 1.16
@@ -49,13 +49,8 @@
# Add reminder as bugnote if store reminders option is ON.
if ( ON == config_get( 'store_reminders' ) ) {
- $t_body = lang_get( 'reminder_sent_to' ) . ' ' .
- ( implode( ', ', $result ) );
- if ( !is_blank( $f_body ) ) {
- $t_body .= "\n\n" . $f_body;
- }
-
- bugnote_add( $f_bug_id, $t_body, config_get(
'default_reminder_view_status' ) == VS_PRIVATE );
+ $t_attr = '|' . implode( '|', $f_to ) . '|';
+ bugnote_add( $f_bug_id, $f_body, config_get(
'default_reminder_view_status' ) == VS_PRIVATE, REMINDER, $t_attr );
}
html_page_top1();
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
|
