Scarab commit: svn commit: r10930 - trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Author: dabbous
Date: 2010-02-27 15:10:35-0800
New Revision: 10930

Modified:
   trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
Fixed some typos in the Email template which occasionally prevented an Email to be sent out. The problem was with the Language settings (i.e. the l10n Localization tool was sometimes not propagated correctly which resulted in NPE's

Modified: trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&pathrev=10930&r1=10929&r2=10930
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2010-02-27 15:10:35-0800
@@ -43,10 +43,10 @@
 #markup('b')$l10n.ActivityPersonnelChanges#markup('b')
 ${cr}-------------------------------------------------------------------------------
 #foreach ($not in $ActivityPersonnelChanges)
-#set ($displayName = $not.Activity.getDisplayName(l10n) )
-#set ($newValue    = $not.Activity.getNewValue(l10n) )
-#set ($oldValue    = $not.Activity.getOldValue(l10n) )
-  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else(${l10n.Deleted}) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
+#set ($displayName = $not.Activity.getDisplayName($l10n) )
+#set ($newValue    = $not.Activity.getNewValue($l10n) )
+#set ($oldValue    = $not.Activity.getOldValue($l10n) )
+  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else($l10n.Deleted) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
 
 #end
 #end
@@ -56,14 +56,14 @@
 #markup('b')$l10n.ActivityAttributeChanges#markup('b')
 ${cr}-------------------------------------------------------------------------------
 #foreach ($not in $ActivityAttributeChanges)
-#set ($displayName = $not.Activity.getDisplayName(l10n) )
-#set ($newValue    = $not.Activity.getNewValue(l10n) )
-#set ($oldValue    = $not.Activity.getOldValue(l10n) )
+#set ($displayName = $not.Activity.getDisplayName($l10n) )
+#set ($newValue    = $not.Activity.getNewValue($l10n) )
+#set ($oldValue    = $not.Activity.getOldValue($l10n) )
 #if ($not.Activity.Attribute.AttributeType.Name == "long-string")
   - $displayName:
     "$newValue"
 #else
-  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else(${l10n.Deleted}) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
+  - $displayName: #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) $oldValue -->#end #if ($newValue.length() > 0)$newValue #else($l10n.Deleted) #end #if ($oldValue.length() == 0)   ($l10n.New) #end
 
 #end
 #end
@@ -96,7 +96,7 @@
 #if ($ActivityComments.size() > 1)
 ${cr}-------------------------------------------------------------------------------
 #end
-#markup('b')${l10n.Comment} $not.Creator.Name#markup('b')$cr
+#markup('b')$l10n.Comment $not.Creator.Name#markup('b')$cr
 $l10n.getIgnoreMissingResource($not.Activity.Attachment.Data)
 #end
 #end
@@ -108,6 +108,6 @@
 #end
   $l10n.ActivityBetween $firstNotification.getActivityCreationDate($l10n) $l10n.ActivityAnd $lastNotification.getActivityCreationDate($l10n).
 #else
-${l10n.ActivityGeneratedBy} #foreach ($creat in $creators)$creat.Name ($creat.Email)#end $l10n.ActivityAt $firstNotification.getActivityCreationDate($l10n)${cr}
+$l10n.ActivityGeneratedBy #foreach ($creat in $creators)$creat.Name ($creat.Email)#end $l10n.ActivityAt $firstNotification.getActivityCreationDate($l10n)${cr}
 #end
 [$module.Name]: $issueURL

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2452987