From 41850cecb48b4b059f652eebbf6b8c9cec6dff50 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 14 May 2013 13:49:19 -0400 Subject: [PATCH] more template updates for i18n --- .../freemarker/body/error/error-display.ftl | 12 +++---- .../freemarker/body/error/error-email.ftl | 22 ++++++------ .../freemarker/body/error/error-standard.ftl | 4 +-- .../freemarker/body/login/adminLogin.ftl | 34 +++++++++---------- .../body/login/fakeExternalAuth.ftl | 10 +++--- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/webapp/web/templates/freemarker/body/error/error-display.ftl b/webapp/web/templates/freemarker/body/error/error-display.ftl index bd1936097..a878bc098 100644 --- a/webapp/web/templates/freemarker/body/error/error-display.ftl +++ b/webapp/web/templates/freemarker/body/error/error-display.ftl @@ -3,27 +3,27 @@ <#-- Template for general system error. -->

- 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 adminErrorData??> <#-- view for site administrators --> <#if adminErrorData.errorMessage?has_content> -

Error message: ${adminErrorData.errorMessage?html}

+

${i18n().error_message}: ${adminErrorData.errorMessage?html}

<#if adminErrorData.stackTrace?has_content>

- Stack trace (full trace available in the vivo log): ${adminErrorData.stackTrace?html} + ${i18n().stack_trace} (${i18n().trace_available}): ${adminErrorData.stackTrace?html}

<#if adminErrorData.cause?has_content> -

Caused by: ${adminErrorData.cause?html}

+

${i18n().caused_by}: ${adminErrorData.cause?html}

<#elseif ! errorOnHomePage> <#-- view for other users --> -

Return to the home page

+

${i18n().return_to_the} ${i18n().home_page}

diff --git a/webapp/web/templates/freemarker/body/error/error-email.ftl b/webapp/web/templates/freemarker/body/error/error-email.ftl index 90963b60f..e3c14b4b5 100644 --- a/webapp/web/templates/freemarker/body/error/error-email.ftl +++ b/webapp/web/templates/freemarker/body/error/error-email.ftl @@ -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 @@

- 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!}

- 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!}

@@ -42,19 +42,19 @@ <#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!} -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!} diff --git a/webapp/web/templates/freemarker/body/error/error-standard.ftl b/webapp/web/templates/freemarker/body/error/error-standard.ftl index 1eedaf780..690f5d041 100644 --- a/webapp/web/templates/freemarker/body/error/error-standard.ftl +++ b/webapp/web/templates/freemarker/body/error/error-standard.ftl @@ -2,6 +2,6 @@ <#-- Template for general system error. --> -

There was an error in the system.

+

${i18n().we_have_an_error}.

-

Return to the home page.

\ No newline at end of file +

${i18n().return_to_the} ${i18n().home_page}

\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/login/adminLogin.ftl b/webapp/web/templates/freemarker/body/login/adminLogin.ftl index d8d856dea..2183d6570 100644 --- a/webapp/web/templates/freemarker/body/login/adminLogin.ftl +++ b/webapp/web/templates/freemarker/body/login/adminLogin.ftl @@ -3,69 +3,69 @@ <#-- Template for login using internal vitro account (even when external auth is enabled). Accessible at /admin/login -->
-

Internal Login

+

${i18n().internal_login}

<#if errorNoEmail??> - <#assign errorMessage = "No email supplied." /> + <#assign errorMessage = i18n().no_email_supplied /> <#if errorNoPassword??> - <#assign errorMessage = "No password supplied." /> + <#assign errorMessage = i18n().no_password_supplied /> <#if errorLoginDisabled??> - <#assign errorMessage = "User logins are temporarily disabled while the system is being maintained." /> + <#assign errorMessage = i18n().logins_temporarily_disabled /> <#if errorLoginFailed??> - <#assign errorMessage = "Email or Password was incorrect." /> + <#assign errorMessage = i18n().incorrect_email_password /> <#if errorNewPasswordWrongLength??> - <#assign errorMessage = "Password must be between 6 and 12 characters." /> + <#assign errorMessage = i18n().password_length /> <#if errorNewPasswordsDontMatch??> - <#assign errorMessage = "Passwords do not match." /> + <#assign errorMessage = i18n().password_mismatch /> <#if errorNewPasswordMatchesOld??> - <#assign errorMessage = "Your new password must be different from your existing password." /> + <#assign errorMessage = i18n().new_pwd_matches_existing /> <#if errorMessage?has_content> <#if !newPasswordRequired??> -

Enter the email address and password for your internal Vitro account.

+

${i18n().enter_email_pasword}

<#else> -

You must change your password to log in.

+

${i18n().change_password}

<#if newPasswordRequired??> - + -

Minimum of 6 characters in length.

+

${i18n().Minimum of 6 characters in length.

- + <#else> - + - + -

+

\ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl index c5c30d24c..f1576b906 100644 --- a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl +++ b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl @@ -3,17 +3,17 @@ <#-- Template for the Fake External Authentication page. -->
-

Fake External Authentication

+

${i18n().fake_external_auth}

- Enter the userID that you want to sign in as, or click Cancel. + ${i18n().enter_id_to_login}

- Username: + ${i18n().username}: - - + +