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

[sartak at bestpractical.com]

Author: sartak
Date: Thu Jun 26 20:07:53 2008
New Revision: 13634

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/share/html/Dashboards/Modify.html
   rt/3.8/trunk/share/html/Dashboards/Queries.html
   rt/3.8/trunk/share/html/Dashboards/Render.html
   rt/3.8/trunk/share/html/Dashboards/Subscription.html

Log:
 r63279 at onn:  sartak | 2008-06-26 17:44:08 -0400
 Better localizability of abort messages in the Dashboard UI


Modified: rt/3.8/trunk/share/html/Dashboards/Modify.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Modify.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Modify.html	Thu Jun 26 20:07:53 2008
@@ -114,8 +114,8 @@
         $id = $Dashboard->Id;
     }
     else {
-        my ($ok) = $Dashboard->LoadById($id);
-        $ok || Abort('Could not load dashboard');
+        my ($ok, $msg) = $Dashboard->LoadById($id);
+        $ok || Abort(loc('Couldn't load dashboard [_1]: [_2]', $id, $msg));
     }
 
     if ($id) {
@@ -145,7 +145,7 @@
 
 if (!$Create && !$tried_create && $id && $ARGS{'Delete'}) {
     my ($ok, $msg) = $Dashboard->Delete();
-    $ok || Abort("Couldn't delete dashboard $id: $msg");
+    $ok || Abort(loc("Couldn't delete dashboard [_1]: [_2]", $id, $msg));
 
     # put the user back into a useful place with a message
     RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Dashboards/index.html?Deleted=$id");

Modified: rt/3.8/trunk/share/html/Dashboards/Queries.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Queries.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Queries.html	Thu Jun 26 20:07:53 2008
@@ -83,8 +83,8 @@
 
 use RT::Dashboard;
 my $Dashboard = new RT::Dashboard($session{'CurrentUser'});
-my ($ok) = $Dashboard->LoadById($id);
-$ok || Abort("Couldn't load dashboard.");
+my ($ok, $msg) = $Dashboard->LoadById($id);
+$ok || Abort(loc("Couldn't load dashboard [_1]: [_2]", $id, $msg));
 my $title = loc("Modify the queries of dashboard [_1]", $Dashboard->Name);
 
 my %desc_of;

Modified: rt/3.8/trunk/share/html/Dashboards/Render.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Render.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Render.html	Thu Jun 26 20:07:53 2008
@@ -79,8 +79,8 @@
 
 use RT::Dashboard;
 my $DashboardObj = RT::Dashboard->new($session{'CurrentUser'});
-my ($ok) = $DashboardObj->LoadById($id);
-Abort('Could not load dashboard') if !$ok;
+my ($ok, $msg) = $DashboardObj->LoadById($id);
+Abort(loc('Couldn't load dashboard [_1]: [_2]', $id, $msg)) if !$ok;
 
 my $SubscriptionObj = RT::Attribute->new($session{'CurrentUser'});
 my $Loaded = 0;

Modified: rt/3.8/trunk/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Subscription.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Subscription.html	Thu Jun 26 20:07:53 2008
@@ -187,11 +187,11 @@
              : $ARGS{'DashboardId'};
 
 ($val, $msg) = $DashboardObj->LoadById($DashboardId);
-$val || Abort("Couldn't load dashboard $DashboardId: $msg.");
+$val || Abort(loc("Couldn't load dashboard [_1]: [_2].", $DashboardId, $msg));
 
 if ($SubscriptionObj->Id && $Unsubscribe) {
     my ($ok, $msg) = $SubscriptionObj->Delete();
-    $ok || Abort("Couldn't unsubscribe to dashboard $DashboardId: $msg");
+    $ok || Abort(loc("Couldn't unsubscribe to dashboard [_1]: [_2]", $DashboardId, $msg));
 
     # put the user back into a useful place with a message
     RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Dashboards/index.html?Unsubscribed=$DashboardId");