Scarab commit: svn commit: r11002 - trunk/src: conf/classes java/org/tigris/scarab/notification webapp/WEB-INF/templates/email/notification

Author: dabbous
Date: 2010-04-22 01:25:44-0700
New Revision: 11002

Modified:
   trunk/src/conf/classes/ScarabBundle_de.properties
   trunk/src/conf/classes/ScarabBundle_en.properties
   trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
   trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm

Log:
Layout changes in Email template, removed redundant information in personel changes, added time information to listings

Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev=11002&r1=11001&r2=11002
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties	2010-04-22 01:25:44-0700
@@ -2,6 +2,8 @@
 ShortDateDisplay=dd.MM.yyyy
 ShortDateTimePattern=dd.MM.yyyy HH:mm
 ShortDateTimeDisplay=dd.MM.yyyy HH:mm
+ShortTimePattern=HH:mm
+
 ScarabWordMark=Scarab
 AdvancedQuery.vm.Title=Erweiterte Abfrage
 ViewQuery.vm.Title=Abfrage prüfen
@@ -1508,7 +1510,7 @@
 ## ***********************************************************************
 
 # ActivitySet
-DefaultModifyIssueEmailSubject=[{0}] #{1} ({4},{2}) {3}
+DefaultModifyIssueEmailSubject=[{0}] #{1} {4} ({2}) {3}
 MinimalModifyIssueEmailSubject=Ticket #{0} geändert
 
 # AbstractScarabModule
@@ -2313,7 +2315,7 @@
 # ActivityTypes keys
 ActivityIssue=Allgemeine Daten
 ActivityAttributeChanges=Änderungen in Attributen
-ActivityPersonnelChanges=Änderungen bei Bearbeitern
+ActivityPersonnelChanges=Änderungen - {0}
 ActivityComments=Kommentare
 ActivityAssociatedInfo=Änderungen der Assoziationen
 ActivityDependencies=Änderungen der Abhängigkeiten

Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev=11002&r1=11001&r2=11002
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties	(original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties	2010-04-22 01:25:44-0700
@@ -10,6 +10,7 @@
 ShortDateDisplay=MM/dd/yyyy
 ShortDateTimePattern=MM/dd/yyyy HH:mm
 ShortDateTimeDisplay=MM/dd/yyyy HH:mm
+ShortTimePattern=HH:mm
 
 ScarabWordMark=Scarab
 AdvancedQuery.vm.Title=Advanced query
@@ -1575,7 +1576,7 @@
 ## ***********************************************************************
 
 # ActivitySet
-DefaultModifyIssueEmailSubject=[{0}] #{1} ({4},{2}) {3}
+DefaultModifyIssueEmailSubject=[{0}] #{1} {4} ({2}) {3}
 MinimalModifyIssueEmailSubject=Issue #{0} modified
 
 # AbstractScarabModule
@@ -2337,7 +2338,7 @@
 # ActivityTypes keys
 ActivityIssue=Issue general information
 ActivityAttributeChanges=Attribute changes
-ActivityPersonnelChanges=Personnel changes
+ActivityPersonnelChanges=Personnel changes ({0})
 ActivityComments=Comments
 ActivityAssociatedInfo=Associated information changes
 ActivityDependencies=Dependency changes

Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&pathrev=11002&r1=11001&r2=11002
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	2010-04-22 01:25:44-0700
@@ -379,6 +379,7 @@
                     EmailContext ectx = new EmailContext();
                     ectx.setIssue(issue);
                     ectx.setLinkTool(new ScarabLink());
+                    ectx.put("format",new org.tigris.scarab.tools.Format());
                     ectx.put("creators", creators);
                     ectx.put("firstNotification", firstNotification);
                     ectx.put("lastNotification", lastNotification);                    

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=11002&r1=11001&r2=11002
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm	2010-04-22 01:25:44-0700
@@ -44,13 +44,17 @@
 #if ($currentDisplayName != $displayName)
 $cr
 -------------------------------------------------------------------------------
-#markup('b')$l10n.ActivityPersonnelChanges ($displayName) #markup('b')
+#markup('b')$l10n.format("ActivityPersonnelChanges", $displayName) #markup('b')
 ${cr}-------------------------------------------------------------------------------
 #end
 #set ($currentDisplayName = $displayName)
 #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 ($fromValue   = "") #if ($oldValue.length() > 0 && $oldValue.length()+$newValue.length() < 70) #set($fromValue = $oldValue) #end
+#set ($toValue     = "") #if ($newValue.length() > 0) #set ($toValue = $newValue) #end
+#set ($transit     = "") #if ($fromValue != "" && $toValue != "") #set ($transit = "-->") #end
+#set ($comment     = "") #if ($fromValue != "" && $toValue == "") #set ($comment = $l10n.Deleted) #elseif ($fromValue == "" && $toValue != "") #set ($comment = $l10n.New ) #end 
+  - $format.getDate($l10n.ShortTimePattern, $not.CreationDate) : $fromValue $transit $toValue #if ($comment != "") ($comment) #end
 
 #end
 #end

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