* ../footer.ftl modified to user i18n() instead due to assign collision

* ../identity.ftl modified english terms to using i18n
 * themes/wilma/i18n/* added properties for identity

themes/wilma/i18n/all.properties

@@ -10,3 +10,15 @@ menu_about = About
 menu_contactus = Contact Us
 menu_support = Support
 menu_version = Version
+
+menu_logout = Log out
+menu_login = Log in
+menu_loginfull = Log in to manage this site
+
+identity_title = VIVO | connect share discover
+identity_index = Index
+identity_edit = Edit Page
+identity_admin = Site Admin
+identity_myprofile = My profile
+identity_myaccount = My account
+identity_user = user

themes/wilma/i18n/all_es.properties

@@ -11,3 +11,19 @@ menu_about = Respecto a
 menu_contactus = Contáctenos
 menu_support = Apoyar
 menu_version = Versión
+
+menu_login = Iniciar la sesión
+menu_loginfull = Iniciar sesión para administrar este sitio
+
+identity_title = VIVO | unir compartir descubrir
+identity_index = Îndex
+identity_edit = Editar página
+identity_myprofile = Mi encuesta
+identity_myaccount = Mi cuenta
+identity_user = usuario
+
+#Items Vetted by Pedro
+#
+menu_logout = Terminar 
+
+identity_admin = Administrador

themes/wilma/templates/footer.ftl

@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#assign i18n = i18n() >
+
 </div> <!-- #wrapper-content -->
 
 <footer role="contentinfo">
@@ -11,21 +11,21 @@
             <#else>
                 ${copyright.text}
             </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="${i18n.menu_termuse}">${i18n.menu_termuse}</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> | 
         </#if>
-        ${i18n.menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n.menu_powered} VIVO"><strong>VIVO</strong></a>
+        ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
         <#if user.hasRevisionInfoAccess>
-             | ${i18n.menu_version} <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
+             | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
         </#if>
     </p>
     
     <nav role="navigation">
         <ul id="footer-nav" role="list">
-            <li role="listitem"><a href="${urls.about}" title="${i18n.menu_about}">${i18n.menu_about}</a></li>
+            <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
             <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="${i18n.menu_contactus}">${i18n.menu_contactus}</a></li>
+                <li role="listitem"><a href="${urls.contact}" title="${i18n().menu_contactus}">${i18n().menu_contactus}</a></li>
             </#if> 
-            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n.menu_support}">${i18n.menu_support}</a></li>
+            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
         </ul>
     </nav>
 </footer>

themes/wilma/templates/identity.ftl

@@ -1,7 +1,8 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <header id="branding" role="banner">
-    <h1 class="vivo-logo"><a title="VIVO | enabling national networking of scientists" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
+
+    <h1 class="vivo-logo"><a title="${i18n().identity_title}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
     <#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
     <#if siteTagline?has_content>
         <em>${siteTagline}</em>
@@ -10,30 +11,30 @@
     <nav role="navigation">
         <ul id="header-nav" role="list">
             <#include "languageSelector.ftl">
-            <li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
+            <li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
             <#if user.loggedIn>
                 <#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE 
                      USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
                      USER IS A SITE ADMIN. tlw72
                      
                      <#if (page??) && (page?is_hash || page?is_hash_ex) && (page.URLToEditPage??) >
-                        <li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
+                        <li role="listitem"><a href="${page.URLToEditPage}" title="${i18n().identity_edit}">${i18n().identity_edit}</a></li>
                      </#if>
                 -->
                 <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
+                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().identity_admin}">${i18n().identity_admin}</a></li>
                 </#if>
                     <li>
                         <ul class="dropdown">
-                            <li id="user-menu"><a href="#" title="user">${user.loginName}</a>
+                            <li id="user-menu"><a href="#" title="${i18n().identity_user}">${user.loginName}</a>
                                 <ul class="sub_menu">
                                      <#if user.hasProfile>
-                                         <li role="listitem"><a href="${user.profileUrl}" title="my profile">My profile</a></li>
+                                         <li role="listitem"><a href="${user.profileUrl}" title="${i18n().identity_myprofile}">${i18n().identity_myprofile}</a></li>
                                      </#if>
                                      <#if urls.myAccount??>
-                                         <li role="listitem"><a href="${urls.myAccount}" title="my account">My account</a></li>
+                                         <li role="listitem"><a href="${urls.myAccount}" title="${i18n().identity_myaccount}">${i18n().identity_myaccount}</a></li>
                                      </#if>
-                                     <li role="listitem"><a href="${urls.logout}" title="log out">Log out</a></li>
+                                     <li role="listitem"><a href="${urls.logout}" title="${i18n().menu_logout}">${i18n().menu_logout}</a></li>
                                 </ul>
                             </li>
                          </ul>
@@ -44,7 +45,7 @@
                 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
                 
             <#else>
-                <li role="listitem"><a class="log-out" title="log in to manage this site" href="${urls.login}">Log in</a></li>
+                <li role="listitem"><a class="log-out" title="${i18n().menu_loginfull}" href="${urls.login}">${i18n().menu_login}</a></li>
             </#if>
         </ul>