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

more template updates for i18n

Browse source
This commit is contained in:
tworrall 2013-05-14 13:49:19 -04:00
parent 63445aa249
commit 41850cecb4
5 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,27 +3,27 @@
<#-- Template for general system error. -->
<p>
There was an error in the system.
${i18n().we_have_an_error}
<#if sentEmail>
This error has been reported to the site administrator.
${i18n().error_was_reported}
</#if>
</p>
<#if adminErrorData??> <#-- view for site administrators -->
<#if adminErrorData.errorMessage?has_content>
<p><strong>Error message:</strong> ${adminErrorData.errorMessage?html}</p>
<p><strong>${i18n().error_message}:</strong> ${adminErrorData.errorMessage?html}</p>
</#if>
<#if adminErrorData.stackTrace?has_content>
<p>
<strong>Stack trace</strong> (full trace available in the vivo log): ${adminErrorData.stackTrace?html}
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): ${adminErrorData.stackTrace?html}
</p>
<#if adminErrorData.cause?has_content>
<p><strong>Caused by:</strong> ${adminErrorData.cause?html}</p>
<p><strong>${i18n().caused_by}:</strong> ${adminErrorData.cause?html}</p>
</#if>
</#if>
<#elseif ! errorOnHomePage> <#-- view for other users -->
<p>Return to the <a href="${urls.home}" title="home page">home page</a></p>
<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>
</#if>

22
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 = "An error occurred on the VIVO site" />
<#assign subject = i18n().error_occurred />
<#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
@ -13,26 +13,26 @@
</head>
<body>
<p>
An error occurred on your VIVO site at ${datetime!}.
${i18n().error_occurred_at(datetime!)}
</p>
<p>
<strong>Requested url:</strong> ${requestedUrl!}
<strong>${i18n().requested_url}:</strong> ${requestedUrl!}
</p>
<p>
<#if errorMessage?has_content>
<strong>Error message:</strong> ${errorMessage!}
<strong>${i18n().error_message}:</strong> ${errorMessage!}
</#if>
</p>
<p>
<strong>Stack trace</strong> (full trace available in the vivo log):
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}):
<pre>${stackTrace!}</pre>
</p>
<#if cause?has_content>
<p><strong>Caused by:</strong>
<p><strong>${i18n().caused_by}:</strong>
<pre>${cause!}</pre>
</p>
</#if>
@ -42,19 +42,19 @@
</#assign>
<#assign text>
An error occurred on your VIVO site at ${datetime!}.
${i18n().error_occurred_at(datetime!)}
Requested url: ${requestedUrl!}
${i18n().requested_url}: ${requestedUrl!}
<#if errorMessage?has_content>
Error message: ${errorMessage!}
${i18n().error_message}: ${errorMessage!}
</#if>
Stack trace (full trace available in the vivo log):
${i18n().stack_trace} (${i18n().trace_available}):
${stackTrace!}
<#if cause?has_content>
Caused by:
${i18n().caused_by}:
${cause!}
</#if>
</#assign>

4
webapp/web/templates/freemarker/body/error/error-standard.ftl
View file

@ -2,6 +2,6 @@
<#-- Template for general system error. -->
<p>There was an error in the system.</p>
<p>${i18n().we_have_an_error}.</p>
<p>Return to the <a href="${urls.home}" title="home page">home page</a>.</p>
<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>