From 4a01fa057bbbadec2070292feaf472017947a889 Mon Sep 17 00:00:00 2001 From: tworrall Date: Fri, 31 May 2013 11:57:37 -0400 Subject: [PATCH] more template updates for i18n --- webapp/web/i18n/all.properties | 8 +++++--- .../freemarker/body/admin/admin-showAuth.ftl | 4 ++-- .../body/contactForm/contactForm-email.ftl | 2 +- .../freemarker/body/error/error-email.ftl | 2 +- .../freemarker/body/login/adminLogin.ftl | 14 +++++++------- .../individual-property-group-tabs.ftl | 2 +- .../edit/forms/autoCompleteObjectPropForm.ftl | 2 +- .../page/partials/languageSelector.ftl | 17 ++++++++--------- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties index bec81cc94..8cfa57c7a 100644 --- a/webapp/web/i18n/all.properties +++ b/webapp/web/i18n/all.properties @@ -227,7 +227,7 @@ group_name = group name scroll_to_menus = scroll to property group menus properties_capitalized = Properties properties = properties -view_all = View All +view_all_capitalized = View All name = name @@ -262,7 +262,8 @@ restrict_logins = Restrict Logins error_alert_icon = Error alert icon current_user = Current user -ext_auth_id = External Auth ID +external_auth_id = External Auth ID +user_role = Role not_logged_in = Not logged in identifiers = Identifiers associated_individuals = Associated Individuals @@ -312,7 +313,7 @@ feedback_thanks_heading = Thank you for your feedback feedback_thanks_text = Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible. return_to_the = Return to the home_page = home page -from = From +from_capitalized = From ip_address = IP address viewing_page = Likely viewing page comments = Comments @@ -738,3 +739,4 @@ vitro_bullet_three = Build a public web site to display your data vitro_bullet_four = Search your data search_vitro = Search VITRO filter_search = filter search + diff --git a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl index 467cec196..5a4b06714 100644 --- a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl +++ b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl @@ -13,11 +13,11 @@ ${stylesheets.add('URI:${currentUser.uri} ${i18n().first_name}:${currentUser.firstName} ${i18n().last_name}:${currentUser.lastName} - ${i18n().email_Address}:${currentUser.emailAddress} + ${i18n().email_address}:${currentUser.emailAddress} ${i18n().external_auth_id}:${currentUser.externalAuthId} ${i18n().login_count}:${currentUser.loginCount} <#list currentUser.permissionSetUris as role> - ${i18n().role}:${role} + ${i18n().user_role}:${role} <#else> ${i18n().not_logged_in} diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl index 2b2672c95..5740cb0e6 100644 --- a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl +++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl @@ -12,7 +12,7 @@

${subject}

-

${i18n().from}: ${name}

+

${i18n().from_capitalized}: ${name}

${i18n().email_address}: ${emailAddress}

diff --git a/webapp/web/templates/freemarker/body/error/error-email.ftl b/webapp/web/templates/freemarker/body/error/error-email.ftl index e3c14b4b5..9f5b360c6 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 = i18n().error_occurred /> +<#assign subject = "${i18n().error_occurred}" /> <#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")> diff --git a/webapp/web/templates/freemarker/body/login/adminLogin.ftl b/webapp/web/templates/freemarker/body/login/adminLogin.ftl index ef49f3e1a..d09934eb7 100644 --- a/webapp/web/templates/freemarker/body/login/adminLogin.ftl +++ b/webapp/web/templates/freemarker/body/login/adminLogin.ftl @@ -6,31 +6,31 @@

${i18n().internal_login}

<#if errorNoEmail??> - <#assign errorMessage = i18n().no_email_supplied /> + <#assign errorMessage = "${i18n().no_email_supplied}" /> <#if errorNoPassword??> - <#assign errorMessage = i18n().no_password_supplied /> + <#assign errorMessage = "${i18n().no_password_supplied}" /> <#if errorLoginDisabled??> - <#assign errorMessage = i18n().logins_temporarily_disabled /> + <#assign errorMessage = "${i18n().logins_temporarily_disabled}" /> <#if errorLoginFailed??> - <#assign errorMessage = i18n().incorrect_email_password /> + <#assign errorMessage = "${i18n().incorrect_email_password}" /> <#if errorNewPasswordWrongLength??> - <#assign errorMessage = i18n().password_length /> + <#assign errorMessage = "${i18n().password_length}" /> <#if errorNewPasswordsDontMatch??> - <#assign errorMessage = i18n().password_mismatch /> + <#assign errorMessage = "${i18n().password_mismatch}" /> <#if errorNewPasswordMatchesOld??> - <#assign errorMessage = i18n().new_pwd_matches_existing /> + <#assign errorMessage = "${i18n().new_pwd_matches_existing}" /> <#if errorMessage?has_content> diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl index f14ce8a8c..3b77322c8 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl @@ -28,7 +28,7 @@ <#if (propertyGroups.all?size > 1) > -
  • ${i18n().view_all}
    • +
  • ${i18n().view_all_capitalized}
  •  
    • diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl index 8c4853db1..d1ae02c59 100644 --- a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl +++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl @@ -39,7 +39,7 @@ <#if editConfiguration.formTitle?contains("collaborator") > - <#assign formTitle = i18n().select_existing_collaborator(editConfiguration.subjectName) /> + <#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" /> <#else> <#assign formTitle = editConfiguration.formTitle /> diff --git a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl index 8dad237ca..991602284 100644 --- a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl +++ b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl @@ -7,15 +7,14 @@ --> <#-- This is included by identity.ftl --> -<#if selectLocale??> -
  • - <#list selectLocale.locales as locale> - - ${locale.label} - - <#if locale_has_next>| - -
    • +<#if selectLocale??> + <#list selectLocale.locales as locale> +
  • + + ${locale.label} + +
    • + <#--