From 8e26a768b59dd22ed74621cfc1888e39899a61ce Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 21 May 2013 10:55:24 -0400
Subject: [PATCH 1/2] some i18n cleanup

---
 .../UserAccountsMyAccountPageStrategy.java    |  2 +-
 webapp/themes/vitro/templates/footer.ftl      |  6 ++---
 webapp/themes/vitro/templates/page-home.ftl   |  2 +-
 webapp/web/i18n/all.properties                | 22 ++++++++-----------
 .../siteAdmin/siteAdmin-indexCacheRebuild.ftl |  2 +-
 .../siteAdmin/siteAdmin-siteConfiguration.ftl |  4 ++--
 .../freemarker/edit/forms/menuManagement.ftl  |  2 +-
 7 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
index b16094631..13436c701 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
@@ -178,7 +178,7 @@ public abstract class UserAccountsMyAccountPageStrategy extends
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
-			email.setSubject(i18n.text("email_changed_subject"));
+			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
 			email.setTemplate(EMAIL_TEMPLATE);
 			email.setBodyMap(body);
 			email.processTemplate();
diff --git a/webapp/themes/vitro/templates/footer.ftl b/webapp/themes/vitro/templates/footer.ftl
index 1a73ce792..eb57f61e5 100644
--- a/webapp/themes/vitro/templates/footer.ftl
+++ b/webapp/themes/vitro/templates/footer.ftl
@@ -11,11 +11,11 @@
             <#else>
                 ${copyright.text}
             </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">Terms of Use</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a></small> | 
         </#if>
-        Powered by <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
+        ${i18n().powered_by} <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
         <#if user.hasRevisionInfoAccess>
-             | Version <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
+             | ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
         </#if>
     </p>
     
diff --git a/webapp/themes/vitro/templates/page-home.ftl b/webapp/themes/vitro/templates/page-home.ftl
index 12c5a4039..85b519eca 100644
--- a/webapp/themes/vitro/templates/page-home.ftl
+++ b/webapp/themes/vitro/templates/page-home.ftl
@@ -31,7 +31,7 @@
                     <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
                     
                     <fieldset>
-                        <legend>Search form</legend>
+                        <legend>${i18n().search_form}</legend>
                         <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > 
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index faa5cf9d4..ca2430721 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -125,7 +125,7 @@ initial_password = Initial password
 submit_add_new_account = Add new account
 
 account_created = Your {0} account has been created.
-account_created_subject Your {0} account has been created.
+account_created_subject = Your {0} account has been created.
 account_created_email_html = @@file files/accountCreatedEmail.html
 account_created_email_text = @@file files/accountCreatedEmail.txt
 account_created_external_email_html = @@file files/accountCreatedExternalOnlyEmail.html
@@ -168,7 +168,7 @@ reset_your_password = Reset your Password
 first_time_login = First time log in
 create_account = Create account
 
-cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. 
+cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. \
                 Please log out and try again.
 account_already_activated = The account for {0} has already been activated.
 
@@ -183,7 +183,7 @@ password_saved_please_login	= Your password has been saved. Please log in.
 
 
 please_provide_contact_information = Please provide your contact information to finish creating your account.
-first_time_login_note = Note: An email will be sent to the address entered above notifying \ 
+first_time_login_note = Note: An email will be sent to the address entered above notifying \
                 that an account has been created.
 first_time_external_email_html = @@file files/accountFirstTimeExternal.html
 first_time_external_email_text = @@file files/accountFirstTimeExternal.txt
@@ -192,7 +192,7 @@ myAccount_heading = My account
 myAccount_confirm_changes = Your changes have been saved.
 myAccount_confirm_changes_plus_note = Your changes have been saved. A confirmation email has been sent to {0}.
 email_change_will_be_confirmed = Note: if email changes, a confirmation email will be sent to the new email address entered above.
-email_changed_subject = "Your VIVO email account has been changed.");
+#email_changed_subject = "Your VIVO email account has been changed.");
 			
 who_can_edit_profile = Who can edit my profile
 add_profile_editor = Add profile editor
@@ -353,8 +353,6 @@ password_mismatch = Passwords do not match.
 new_pwd_matches_existing = Your new password must be different from your existing password.
 enter_email_password = Enter the email address and password for your internal Vitro account.
 change_password = You must change your password to log in.
-new_password = New Password
-confirm_password = Confirm Password
 email_capitalized = Email
 password_capitalized = Password
 login_button = Log in
@@ -451,7 +449,7 @@ associate_classes_with_group = and associate classes with the group created.
 refresh_content = Refresh Content
 rebuild_search_index = Rebuild search index
 rebuild_vis_cache = Rebuild visualization cache
-recompute_inferences = Recompute inferences
+recompute_inferences_mixed_caps = Recompute inferences
 
 site_administration = Site Administration
 
@@ -480,8 +478,8 @@ site_config = Site Configuration
 internal_class = Institutional internal class
 manage_profile_editing = Manage profile editing
 page_management = Page management
-menu_ordering = Menu ordering
-restrict_logins = Restrict Logins
+menu_ordering_mixed_caps = Menu ordering
+restrict_logins_mixed_caps = Restrict logins
 site_information = Site information
 user_accounts = User accounts
 
@@ -572,7 +570,6 @@ no_results_returned = No results were returned.
 #
 # manage proxies templates ( /templates/freemarker/body/manageproxies ) 
 #
-manage_profile_editing = Manage profile editing
 operation_successful = The operation was successful.
 operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
 relate_editors_profiles = Relate profile editors and profiles
@@ -582,7 +579,6 @@ select_editors = Select editors
 select_last_name = Select an existing last name
 processing_indicator = processing time indicator
 type_more_chars = type more character
-remove_selection = Remove selection
 select_profiles = Select profiles
 profile_editors = Profile editors
 search_button = Search
@@ -691,7 +687,7 @@ confirm_menu_item_delete = Are you sure you want to remove
 pretty_url = Pretty URL
 start_with_leading_slash = Must begin with a leading forward slash: / (e.g., /people)
 default = Default
-custom_template = Custom template
+custom_template_mixed_caps = Custom template
 change_content_type = Change content type
 select_page_content_type = Select content type for the associated page
 select_content_display = Select content to display
@@ -740,4 +736,4 @@ vitro_bullet_two = Edit instances and relationships
 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
\ No newline at end of file
+filter_search = filter search
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
index 70c73c4eb..87adb5232 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
@@ -16,7 +16,7 @@
             </#if>
             
             <#if indexCacheRebuild.recomputeInferences?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences}</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences_mixed_caps}</a></li>
             </#if>
         </ul>
     </section>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 1156f7847..b5129203d 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -20,11 +20,11 @@
             </#if>        
             
             <#if siteConfig.menuManagement?has_content>
-                <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering}</a></li>
+                <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering_mixed_caps}</a></li>
             </#if>      
             
             <#if siteConfig.restrictLogins?has_content>
-                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins}</a></li>
+                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins_mixed_caps}</a></li>
             </#if>
             
             <#if siteConfig.siteInfo?has_content>
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index 39a947e5d..7e93da003 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -36,7 +36,7 @@
         <label class="inline" for="default"> ${i18n().default}</label>
         <br />
         <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
-        <label class="inline" for="custom"> ${i18n().custom_template}</label>
+        <label class="inline" for="custom"> ${i18n().custom_template_mixed_caps}</label>
         
         <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
             <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>

From 749e667e6a621d1d0d5e1130822e62999cbf5ba2 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 21 May 2013 10:56:25 -0400
Subject: [PATCH 2/2] some i18n cleanup

---
 webapp/web/i18n/all.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index ca2430721..bec81cc94 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -726,6 +726,7 @@ no_classes_to_select = There are no Classes in the system from which to select.
 #
 # vitro theme templates ( /themes/vitro/templates ) 
 #
+powered_by = Powered by
 javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser.
 
 what_is_vitro = What is VITRO?