Omaha #4547 Convert MND headers to mixed case.

Change-Id: I28cc038b6efbd2be2f5d24128cfe8a4eead00dcb Former-commit-id: 1219cb236b964b5be835f468f6717bc447ef9251
2015-06-24 14:42:53 -05:00 · 2015-06-24 14:42:53 -05:00 · 723dab627e
commit 723dab627e
parent c5c9fff1fc
29 changed files with 188 additions and 188 deletions
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/airportWeatherWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/airportWeatherWarning.vm
@ -13,13 +13,13 @@ AWW${siteId}
 ${ugcline} 

 #if(${productClass}=="T")
-TEST...AIRPORT WEATHER WARNING...TEST##
+TEST...Airport Weather Warning...TEST##
 #else
-AIRPORT WEATHER WARNING
+Airport Weather Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 
 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory.vm
@ -114,13 +114,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLS${siteId}

 #if(${productClass}=="T")
-TEST...FLOOD ADVISORY...TEST
+TEST...Flood Advisory...TEST
 #else
-FLOOD ADVISORY
+Flood Advisory
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugcline}
@ -134,7 +134,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup.vm
@ -21,19 +21,19 @@
 	#set($extend = false)
 #end
 ##
-#set($advType = "FLOOD ADVISORY")
+#set($advType = "Flood Advisory")
 #set($advTypeShort = "minor flooding")
 #if(${list.contains(${bullets}, "small")})
-	#set($advType = "SMALL STREAM FLOOD ADVISORY")
+	#set($advType = "Small Stream Flood Advisory")
 	#set($advTypeShort = "small stream flooding")
 #elseif(${list.contains(${bullets}, "uss")})
-	#set($advType = "URBAN AND SMALL STREAM FLOOD ADVISORY")
+	#set($advType = "Urban and Small Stream Flood Advisory")
 	#set($advTypeShort = "urban and small stream flooding")	
 #elseif(${list.contains(${bullets}, "arroyo")})
-	#set($advType = "ARROYO AND SMALL STREAM FLOOD ADVISORY")
+	#set($advType = "Arroyo and Small Stream Flood Advisory")
 	#set($advTypeShort = "arroyo and small stream flooding")
 #elseif(${list.contains(${bullets}, "hydrologic")})
-	#set($advType = "HYDROLOGIC ADVISORY")
+	#set($advType = "Hydrologic Advisory")
 	#set($advTypeShort = "minor flooding")
 #end

@ -166,13 +166,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLS${siteId}

 #if(${productClass}=="T")
-TEST...FLOOD ADVISORY...TEST
+TEST...Flood Advisory...TEST
 #else
-FLOOD ADVISORY
+Flood Advisory
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -190,7 +190,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -415,13 +415,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLS${siteId}

 #if(${productClass}=="T")
-TEST...FLOOD ADVISORY...TEST
+TEST...Flood Advisory...TEST
 #else
-FLOOD ADVISORY
+Flood Advisory
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -439,7 +439,7 @@ ${ugclinecan}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -485,7 +485,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -638,13 +638,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLS${siteId}

 #if(${productClass}=="T")
-TEST...FLOOD ADVISORY...TEST
+TEST...Flood Advisory...TEST
 #else
-FLOOD ADVISORY
+Flood Advisory
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -662,7 +662,7 @@ ${ugclinecan}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -706,7 +706,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning.vm
@ -77,13 +77,13 @@ FLW${siteId}

 BULLETIN - IMMEDIATE BROADCAST REQUESTED
 #if(${productClass}=="T")
-TEST...FLOOD WARNING...TEST
+TEST...Flood Warning...TEST
 #else
-FLOOD WARNING
+Flood Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugcline}
@ -97,7 +97,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup.vm
@ -63,11 +63,11 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FLS${siteId}

 #if(${productClass}=="T")
-TEST...FLOOD STATEMENT...TEST
+TEST...Flood Statement...TEST
 #else
-FLOOD STATEMENT
+Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
 ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/burnScarFlashFloodWarning.vm
@ -49,13 +49,13 @@ ${ugcline}
 #################################### MND HEADER ###################################
 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...FLASH FLOOD WARNING...TEST
+TEST...Flash Flood Warning...TEST
 #else
-FLASH FLOOD WARNING
+Flash Flood Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/burnScarFlashFloodWarningFollowup.vm
@ -42,13 +42,13 @@
 ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FFS${siteId}
 #if(${productClass}=="T")
-TEST...FLASH FLOOD STATEMENT...TEST
+TEST...Flash Flood Statement...TEST
 #else
-FLASH FLOOD STATEMENT
+Flash Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${action}=="COR" && ${cancelareas})
@ -94,7 +94,7 @@ ${ugcline}
 #end
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -170,7 +170,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -191,7 +191,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarning.vm
@ -20,13 +20,13 @@ ${ugcline}

 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...EXTREME WIND WARNING...TEST
+TEST...Extreme Wind Warning...TEST
 #else
-EXTREME WIND WARNING
+Extreme Wind Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
@ -30,13 +30,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

 #if(${productClass}=="T")
-TEST...SEVERE WEATHER STATEMENT...TEST
+TEST...Severe Weather Statement...TEST
 #else
-SEVERE WEATHER STATEMENT
+Severe Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -53,7 +53,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -138,13 +138,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

 #if(${productClass}=="T")
-TEST...SEVERE WEATHER STATEMENT...TEST
+TEST...Severe Weather Statement...TEST
 #else
-SEVERE WEATHER STATEMENT
+Severe Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -161,7 +161,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -309,13 +309,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

 #if(${productClass}=="T")
-TEST...SEVERE WEATHER STATEMENT...TEST
+TEST...Severe Weather Statement...TEST
 #else
-SEVERE WEATHER STATEMENT
+Severe Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -332,7 +332,7 @@ ${ugclinecan}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -380,7 +380,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -490,10 +490,10 @@ The safest place to be during a major landfalling hurricane is in a reinforced i
 ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

-SEVERE WEATHER STATEMENT
-NATIONAL WEATHER SERVICE ${officeShort}
+Severe Weather Statement
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugcline}
@ -506,7 +506,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/fireWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/fireWarning.vm
@ -15,9 +15,9 @@ FRW${siteId}

 <L>BULLETIN - EAS ACTIVATION REQUESTED</L>
 #if(${productClass}=="T")
-<L>TEST...FIRE WARNING...TEST</L>
+<L>TEST...Fire Warning...TEST</L>
 #else
-<L>FIRE WARNING</L>
+<L>Fire Warning</L>
 #end
 #set($requestedBy = "!** ENTER REQUESTING AGENCY NAME HERE **!")
 #if(${list.contains(${bullets}, "agency1")})
@ -26,12 +26,12 @@ FRW${siteId}
 #if(${list.contains(${bullets}, "agency2")})
 #set($requestedBy = "Example Agency 2")
 #end
-#set($agencyNameLine = "REQUESTED BY ${requestedBy}")
+#set($agencyNameLine = "Requested by ${requestedBy}")
 #capitalize(${agencyNameLine} "ALL")

-<L>RELAYED BY NATIONAL WEATHER SERVICE ${officeShort}</L>
+<L>Relayed by National Weather Service ${officeShort}</L>
 #backupText(${backupSite})
-<L>#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+<L>${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}
 </L>

 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning.vm
@ -42,13 +42,13 @@ ${ugcline}
 #################################### MND HEADER ###################################
 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...FLASH FLOOD WARNING...TEST
+TEST...Flash Flood Warning...TEST
 #else
-FLASH FLOOD WARNING
+Flash Flood Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup.vm
@ -42,13 +42,13 @@
 ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FFS${siteId}
 #if(${productClass}=="T")
-TEST...FLASH FLOOD STATEMENT...TEST
+TEST...Flash Flood Statement...TEST
 #else
-FLASH FLOOD STATEMENT
+Flash Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${action}=="COR" && ${cancelareas})
@ -94,7 +94,7 @@ ${ugcline}
 #end
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -191,7 +191,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -212,7 +212,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereThunderstormWarning.vm
@ -308,13 +308,13 @@ ${ugcline}

 BULLETIN - ${easActivation}
 #if(${productClass}=="T")
-TEST...SEVERE THUNDERSTORM WARNING...TEST
+TEST...Severe Thunderstorm Warning...TEST
 #else
-SEVERE THUNDERSTORM WARNING
+Severe Thunderstorm Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
@ -42,7 +42,7 @@
 ############################################
 ##PATHCAST LEAD VARIABLE ADD LATER????? 
 #if(${phenomena}=="SV")
-  #set($eventType = "severe thunderstorm")
+  #set($eventType = "SEVERE THUNDERSTORM")
    #if(${stormType} == "line")
      #set($reportType1 = "severe thunderstorms were")
      #set($reportType2 = "these storms were")
@ -55,7 +55,7 @@
      #set($pathcastLead = "this severe storm")
    #end
 #elseif(${phenomena}=="TO")
-  #set($eventType = "tornado")
+  #set($eventType = "TORNADO")
  #set($torTag = "radar indicated")
  #set($torThreat = "")
  #set($torHazard = "tornado")
@ -86,13 +86,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

 #if(${productClass}=="T")
-TEST...SEVERE WEATHER STATEMENT...TEST
+TEST...Severe Weather Statement...TEST
 #else
-SEVERE WEATHER STATEMENT
+Severe Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${action}=="COR" && ${cancelareas})
@ -132,7 +132,7 @@ ${ugcline}
 #end
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -358,7 +358,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -378,7 +378,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSpecialMarineWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSpecialMarineWarning.vm
@ -41,13 +41,13 @@ ${ugcline}

 BULLETIN - IMMEDIATE BROADCAST REQUESTED
 #if(${productClass}=="T")
-TEST...SPECIAL MARINE WARNING...TEST
+TEST...Special Marine Warning...TEST
 #else
-SPECIAL MARINE WARNING
+Special Marine Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSpecialMarineWarningFollowup.vm
@ -47,13 +47,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 MWS${siteId}

 #if(${productClass}=="T")
-TEST...MARINE WEATHER STATEMENT...TEST
+TEST...Marine Weather Statement...TEST
 #else
-MARINE WEATHER STATEMENT
+Marine Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -76,7 +76,7 @@ ${ugclinecan}
 ${ugcline}
 /${productClass}.${action}.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/
 #end
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -272,7 +272,7 @@ $$

 ${ugcline}
 /${productClass}.CON.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -285,7 +285,7 @@ THIS IS A TEST MESSAGE.##
 #elseif(${CORCAN}=="true")
 ${ugcline}
 /${productClass}.COR.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactTornadoWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactTornadoWarning.vm
@ -189,13 +189,13 @@ ${ugcline}

 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...TORNADO WARNING...TEST
+TEST...Tornado Warning...TEST
 #else
-TORNADO WARNING
+Tornado Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 ## end of addition
 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/marineWeatherStatement.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/marineWeatherStatement.vm
@ -29,13 +29,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 MWS${siteId}

 #if(${productClass}=="T")
-TEST...MARINE WEATHER STATEMENT...TEST
+TEST...Marine Weather Statement...TEST
 #else
-MARINE WEATHER STATEMENT
+Marine Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 #if(${productClass}=="T")
 ...THIS MESSAGE IS FOR TEST PURPOSES ONLY...
@ -46,7 +46,7 @@ NATIONAL WEATHER SERVICE ${officeShort}
 ## Deleted VTEC and Marine Zone Name lines to come in line with NWS Directive 10-314
 ######################################################################
 ${ugcline}
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/marineWeatherStatementAshfall.vm
@ -23,13 +23,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 MWS${siteId}

 #if(${productClass}=="T")
-TEST...MARINE WEATHER STATEMENT...TEST
+TEST...Marine Weather Statement...TEST
 #else
-MARINE WEATHER STATEMENT
+Marine Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 #if(${productClass}=="T")
 ...THIS MESSAGE IS FOR TEST PURPOSES ONLY...
@ -40,7 +40,7 @@ NATIONAL WEATHER SERVICE ${officeShort}
 ## Deleted VTEC and Marine Zone Name lines to come in line with NWS Directive 10-314
 ######################################################################
 ${ugcline}
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning.vm
@ -128,13 +128,13 @@ ${ugcline}

 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...FLASH FLOOD WARNING...TEST
+TEST...Flash Flood Warning...TEST
 #else
-FLASH FLOOD WARNING
+Flash Flood Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup.vm
@ -147,13 +147,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FFS${siteId}

 #if(${productClass}=="T")
-TEST...FLASH FLOOD STATEMENT...TEST
+TEST...Flash Flood Statement...TEST
 #else
-FLASH FLOOD STATEMENT
+Flash Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugcline}
@ -167,7 +167,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #end
@ -407,13 +407,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FFS${siteId}

 #if(${productClass}=="T")
-TEST...FLASH FLOOD STATEMENT...TEST
+TEST...Flash Flood Statement...TEST
 #else
-FLASH FLOOD STATEMENT
+Flash Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugclinecan}
@ -427,7 +427,7 @@ ${ugclinecan}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -467,7 +467,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -663,13 +663,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 FFS${siteId}

 #if(${productClass}=="T")
-TEST...FLASH FLOOD STATEMENT...TEST
+TEST...Flash Flood Statement...TEST
 #else
-FLASH FLOOD STATEMENT
+Flash Flood Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 ${ugclinecan}
@ -683,7 +683,7 @@ ${ugclinecan}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -715,7 +715,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeThunderstormWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeThunderstormWarning.vm
@ -206,13 +206,13 @@ ${ugcline}

 BULLETIN - ${easActivation}
 #if(${productClass}=="T")
-TEST...SEVERE THUNDERSTORM WARNING...TEST
+TEST...Severe Thunderstorm Warning...TEST
 #else
-SEVERE THUNDERSTORM WARNING
+Severe Thunderstorm Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/severeWeatherStatement.vm
@ -57,13 +57,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SVS${siteId}

 #if(${productClass}=="T")
-TEST...SEVERE WEATHER STATEMENT...TEST
+TEST...Severe Weather Statement...TEST
 #else
-SEVERE WEATHER STATEMENT
+Severe Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${action}=="COR" && ${cancelareas})
@ -103,7 +103,7 @@ ${ugcline}
 #end
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -328,7 +328,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
@ -348,7 +348,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/shortTermForecast.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/shortTermForecast.vm
@ -18,13 +18,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 NOW${siteId}

 #if(${productClass}=="T")
-TEST...SHORT TERM FORECAST...TEST
+TEST...Short Term Forecast...TEST
 #else
-SHORT TERM FORECAST
+Short Term Forecast
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 
 #if(${productClass}=="T")
@ -37,7 +37,7 @@ ${ugcline}
 #set($zoneList = "${zoneList}#capitalize(${area.name} 'ALL')-")
 #end
 ${zoneList}
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}



--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/significantWeatherAdvisory.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/significantWeatherAdvisory.vm
@ -108,14 +108,14 @@
 ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SPS${siteId}
 #if(${productClass}=="T")
-TEST...SPECIAL WEATHER STATEMENT...TEST##
+TEST...Special Weather Statement...TEST##
 #else
-SPECIAL WEATHER STATEMENT##
+Special Weather Statement##
 #end

-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}
 
 #if(${productClass}=="T")

@ -132,7 +132,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 #if(${productClass}=="T")

--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarning.vm
@ -33,13 +33,13 @@ ${ugcline}

 BULLETIN - IMMEDIATE BROADCAST REQUESTED
 #if(${productClass}=="T")
-TEST...SPECIAL MARINE WARNING...TEST
+TEST...Special Marine Warning...TEST
 #else
-SPECIAL MARINE WARNING
+Special Marine Warning
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialMarineWarningFollowup.vm
@ -34,13 +34,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 MWS${siteId}

 #if(${productClass}=="T")
-TEST...MARINE WEATHER STATEMENT...TEST
+TEST...Marine Weather Statement...TEST
 #else
-MARINE WEATHER STATEMENT
+Marine Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 #if(${productClass}=="T")

@ -66,7 +66,7 @@ ${ugclinecan}
 ${ugcline}
 /${productClass}.${action}.${vtecOffice}.MA.W.${oldvtec}.000000T0000Z-${dateUtil.format(${expire}, ${timeFormat.ymdthmz}, 15)}/
 #end
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 #if(${productClass}=="T")

--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
@ -171,13 +171,13 @@ ${WMOId} ${vtecOffice} 000000 ${BBBId}
 SPS${siteId}

 #if(${productClass}=="T")
-TEST...SPECIAL WEATHER STATEMENT...TEST
+TEST...Special Weather Statement...TEST
 #else
-SPECIAL WEATHER STATEMENT
+Special Weather Statement
 #end
-NATIONAL WEATHER SERVICE ${officeShort}
+National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 
 #if(${productClass}=="T")
@ -193,7 +193,7 @@ ${ugcline}
 -##
 #end

-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}


 #if(${productClass}=="T")
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/tornadoWarning.vm
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/tornadoWarning.vm
@ -107,14 +107,14 @@ ${ugcline}

 BULLETIN - EAS ACTIVATION REQUESTED
 #if(${productClass}=="T")
-TEST...TORNADO WARNING...TEST
+TEST...Tornado Warning...TEST
 #else
-TORNADO WARNING
+Tornado Warning
 #end
-##NATIONAL WEATHER SERVICE ${officeShort}
+##National Weather Service ${officeShort}
 National Weather Service ${officeShort}
 #backupText(${backupSite})
-#capitalize(${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})} "ALL")
+${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}

 ## end of addition
 #if(${productClass}=="T")