[Rt-commit] r13576 - in rt/3.8/trunk: . sbin

[sartak at bestpractical.com]

Author: sartak
Date: Tue Jun 24 16:52:48 2008
New Revision: 13576

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/etc/RT_Config.pm.in
   rt/3.8/trunk/sbin/rt-email-dashboards.in

Log:
 r63180 at onn:  sartak | 2008-06-24 16:51:13 -0400
 Make DashboardSubject configurable


Modified: rt/3.8/trunk/etc/RT_Config.pm.in
==============================================================================
--- rt/3.8/trunk/etc/RT_Config.pm.in	(original)
+++ rt/3.8/trunk/etc/RT_Config.pm.in	Tue Jun 24 16:52:48 2008
@@ -548,6 +548,16 @@
 
 Set($ShowBccHeader, 0);
 
+=item C<$DashboardSubject>
+
+Lets you set the subject of dashboards. Arguments are the frequency (Daily,
+Weekly, Monthly) of the dashboard and the dashboard's name. [_1] for the name
+of the dashboard.
+
+=cut
+
+Set($DashboardSubject, '%s Dashboard: %s');
+
 =back
 
 =head1 GnuPG Configuration

Modified: rt/3.8/trunk/sbin/rt-email-dashboards.in
==============================================================================
--- rt/3.8/trunk/sbin/rt-email-dashboards.in	(original)
+++ rt/3.8/trunk/sbin/rt-email-dashboards.in	Tue Jun 24 16:52:48 2008
@@ -230,10 +230,10 @@
         RT->Config->Get('WebURL') . '/Dashboards/Render.html',
     );
 
-    send_mail($currentuser, $dashboard, $subscription, $contents);
+    email_dashboard($currentuser, $dashboard, $subscription, $contents);
 }
 
-sub send_mail {
+sub email_dashboard {
     my ($currentuser, $dashboard, $subscription, $content) = @_;
 
     verbose 'Sending dashboard "[_1]" to user [_2] <[_3]>',
@@ -241,11 +241,10 @@
             $currentuser->Name,
             email_of($currentuser);
 
-    my $subject = $currentuser->loc(
-        (RT->Config->Get('DashboardSubject') || "RT [_2] Dashboard: [_1]"),
-        $dashboard->Name,
+    my $subject = sprintf '[%s] ' .  RT->Config->Get('DashboardSubject'),
+        RT->Config->Get('rtname'),
         ucfirst($subscription->SubValue('Frequency')),
-    );
+        $dashboard->Name;
 
     my $entity = build_email(
         $content, $from, email_of($currentuser), $subject,