litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name

Browse source
This commit is contained in:
Tim Worrall 2014-06-20 13:08:55 -04:00
parent 90cec22e9d
commit 59ddbe15ec
21 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/error/error-display.ftl
View file

@ -15,7 +15,7 @@
</#if>
<#if adminErrorData.stackTrace?has_content>
<p>
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): ${adminErrorData.stackTrace?html}
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): ${adminErrorData.stackTrace?html}
</p>
<#if adminErrorData.cause?has_content>

10
webapp/web/templates/freemarker/body/error/error-email.ftl
View file

@ -2,7 +2,7 @@
<#-- Template for email message sent to site administrator when an error occurs on the site. -->
<#assign subject = "${i18n().error_occurred}" />
<#assign subject = "${i18n().error_occurred(siteName!)}" />
<#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
@ -13,7 +13,7 @@
</head>
<body>
<p>
${i18n().error_occurred_at(datetime!)}
${i18n().error_occurred_at(siteName!,datetime!)}
</p>
<p>
@ -27,7 +27,7 @@
</p>
<p>
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}):
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}):
<pre>${stackTrace!}</pre>
</p>
@ -42,7 +42,7 @@
</#assign>
<#assign text>
${i18n().error_occurred_at(datetime!)}
${i18n().error_occurred_at(siteName!,datetime!)}
${i18n().requested_url}: ${requestedUrl!}
@ -50,7 +50,7 @@ ${i18n().requested_url}: ${requestedUrl!}
${i18n().error_message}: ${errorMessage!}
</#if>
${i18n().stack_trace} (${i18n().trace_available}):
${i18n().stack_trace} (${i18n().trace_available(siteName!)}):
${stackTrace!}
<#if cause?has_content>

2
webapp/web/templates/freemarker/body/error/error-titled.ftl
View file

@ -2,6 +2,6 @@
<#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. -->
<h2>${title}</h2>
<h2>${title!}</h2>
<#include "error-message.ftl">