From b39624d31d7ebb8262bbacfb451c5fd8e5fe736d Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 16 Sep 2008 19:36:12 +0000
Subject: [PATCH] WBGP indent processTemplate.  i18n an error message

---
 lib/WebGUI/Asset.pm              | 34 +++++++++++++++++---------------
 lib/WebGUI/i18n/English/Asset.pm |  6 ++++++
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 59b91f51d..e03b38c3d 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2061,10 +2061,10 @@ Instead of passing in a templateId, you may pass in a template object.
 =cut
 
 sub processTemplate {
-	my $self = shift;
-	my $var = shift;
-	my $templateId = shift;
-	my $template = shift;
+    my $self = shift;
+    my $var = shift;
+    my $templateId = shift;
+    my $template = shift;
 
     # Sanity checks
     if (ref $var ne "HASH") {
@@ -2072,19 +2072,21 @@ sub processTemplate {
         return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className");
     }
 
-	$template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template);
-	if (defined $template) {
+    $template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template);
+    if (defined $template) {
         $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
-		$var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;
-                my %vars = (
-			%{$self->{_properties}},
-			%{$var}
-			);
-		return $template->process(\%vars);
-	} else {
-		$self->session->errorHandler->error("Can't instantiate template $templateId for asset ".$self->getId);
-		return "Error: Can't instantiate template ".$templateId;
-	}
+        $var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;
+        my %vars = (
+            %{$self->{_properties}},
+            %{$var}
+        );
+        return $template->process(\%vars);
+    }
+    else {
+        $self->session->errorHandler->error("Can't instantiate template $templateId for asset ".$self->getId);
+        my $i18n = WebGUI::International->new($self->session, 'Asset');
+        return $i18n->get('Error: Cannot instantiate template').' '.$templateId;
+    }
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index 9268933de..0ddca4e5e 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -1103,6 +1103,12 @@ Couldn't open %-s because %-s <br />
         context     => q{Label for the menu to show actions to perform on an asset},
     },
 
+    'Error: Cannot instantiate template' => {
+        message     => q{Error: Cannot instantiate template},
+        lastUpdated => 1221593874,
+        context     => q{Error message in Asset.pm},
+    },
+
 };
 
 1;