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>

34
webapp/web/templates/freemarker/body/login/adminLogin.ftl
View file

@ -3,69 +3,69 @@
<#-- Template for login using internal vitro account (even when external auth is enabled). Accessible at /admin/login -->
<section id="internalLogin" role="region">
<h2>Internal Login</h2>
<h2>${i18n().internal_login}</h2>
<#if errorNoEmail??>
<#assign errorMessage = "No email supplied." />
<#assign errorMessage = i18n().no_email_supplied />
</#if>
<#if errorNoPassword??>
<#assign errorMessage = "No password supplied." />
<#assign errorMessage = i18n().no_password_supplied />
</#if>
<#if errorLoginDisabled??>
<#assign errorMessage = "User logins are temporarily disabled while the system is being maintained." />
<#assign errorMessage = i18n().logins_temporarily_disabled />
</#if>
<#if errorLoginFailed??>
<#assign errorMessage = "Email or Password was incorrect." />
<#assign errorMessage = i18n().incorrect_email_password />
</#if>
<#if errorNewPasswordWrongLength??>
<#assign errorMessage = "Password must be between 6 and 12 characters." />
<#assign errorMessage = i18n().password_length />
</#if>
<#if errorNewPasswordsDontMatch??>
<#assign errorMessage = "Passwords do not match." />
<#assign errorMessage = i18n().password_mismatch />
</#if>
<#if errorNewPasswordMatchesOld??>
<#assign errorMessage = "Your new password must be different from your existing password." />
<#assign errorMessage = i18n().new_pwd_matches_existing />
</#if>
<#if errorMessage?has_content>
<section id="error-alert" role="alert">
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}"/>
<p>${errorMessage}</p>
</section>
</#if>
<#if !newPasswordRequired??>
<p>Enter the email address and password for your internal Vitro account.</p>
<p>${i18n().enter_email_pasword}</p>
<#else>
<p>You must change your password to log in.</p>
<p>${i18n().change_password}</p>
</#if>
<form method="post" action="${controllerUrl}">
<#if newPasswordRequired??>
<label for="newPassword">New Password</label>
<label for="newPassword">${i18n().new_password}</label>
<input name="newPassword" id="newPassword" class="text-field" type="password" required autofocus />
<p class="password-note">Minimum of 6 characters in length.</p>
<p class="password-note">${i18n().Minimum of 6 characters in length.</p>
<label for="confirmPassword">Confirm Password</label>
<label for="confirmPassword">${i18n().confirm_password}</label>
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
<input id="email" name="email" type="hidden" value="${email!}" />
<input id="password" name="password" type="hidden" value="${password!}" />
<#else>
<label for="email">Email</label>
<label for="email">${i18n().email_capitalized}</label>
<input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
<label for="password">Password</label>
<label for="password">${i18n().password_capitalized}</label>
<input id="password" name="password" class="text-field" type="password" required />
</#if>
<p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p>
<p class="submit"><input name="loginForm" type="submit" class="green button" value="${i18n().login_button}"/></p>
</form>
</section>

10
webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
View file

@ -3,17 +3,17 @@
<#-- Template for the Fake External Authentication page. -->
<section role="region">
<h2>Fake External Authentication</h2>
<h2>${i18n().fake_external_auth}</h2>
<p>
Enter the userID that you want to sign in as, or click Cancel.
${i18n().enter_id_to_login}
</p>
<form action="${controllerUrl}">
Username:
${i18n().username}:
<input type="text" name="username" />
<input type="submit" value="submit" />
<input type="submit" name="cancel" value="cancel" />
<input type="submit" value="${i18n().submit_button}" />
<input type="submit" name="cancel" value="${i18n().cancel_link}" />
</form>
<br/>
</section>