From a75b814399befe8020c98685335b43b36c73bd07 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sat, 27 Apr 2013 00:00:57 -0400
Subject: [PATCH 1/8] Proof of concept - Image upload

---
 .../body/individual/individual--foaf-person.ftl        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index a7f2911c..263d802c 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -46,3 +46,13 @@
 </#if>
 <#include selectedTemplate >
 
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/individualUtils.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/individual/propertyGroupControls.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/individual/individualUriRdf.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+
+<script type="text/javascript">
+    i18n_confirmDelete = "${i18n().confirm_delete}"
+</script>
+              

From ecfe5161c78520705098b53355b83aa3b5765cff Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sat, 27 Apr 2013 00:01:23 -0400
Subject: [PATCH 2/8] Improve the look of the language selection flags

---
 themes/wilma/i18n/images/select_locale_en_AU.GIF | Bin 0 -> 1613 bytes
 ...ect_locale_en.GIF => select_locale_en_US.GIF} | Bin
 ...ect_locale_es.GIF => select_locale_es_ES.GIF} | Bin
 themes/wilma/i18n/images/select_locale_es_MX.GIF | Bin 0 -> 1296 bytes
 themes/wilma/i18n/images/select_locale_fr.GIF    | Bin 1169 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 themes/wilma/i18n/images/select_locale_en_AU.GIF
 rename themes/wilma/i18n/images/{select_locale_en.GIF => select_locale_en_US.GIF} (100%)
 rename themes/wilma/i18n/images/{select_locale_es.GIF => select_locale_es_ES.GIF} (100%)
 create mode 100644 themes/wilma/i18n/images/select_locale_es_MX.GIF
 delete mode 100644 themes/wilma/i18n/images/select_locale_fr.GIF

diff --git a/themes/wilma/i18n/images/select_locale_en_AU.GIF b/themes/wilma/i18n/images/select_locale_en_AU.GIF
new file mode 100644
index 0000000000000000000000000000000000000000..e4c2274c8deb7f9f33be2520d0cf3710fc114a60
GIT binary patch
literal 1613
zcmeIx{ZA7I7zglc<)w!bt1zf<NSpGe$XYgEIwdI`@=`(Bscak~;Q0d7@zO(toH}qf
zAbL0%ry|_c0!5tELA1UsoQmLC9NrM;$tJsLbRIh0F{7z7S-K<pasR@;`TX>Ket426
zd6H5Rml^VmfEsWEdXE&h#O)D9k05w>3Gd+~oQIXL{|?<!M7Nt^-3;TV8Ml*mla!l~
zkZzn5MYl*ZqJtJmN+d{8YH&itB)EuTqD6v=2r9xB5k^D^5lxUFih|%41W`ax0k#Mb
zBA8)8>h)$pZxYmcK_!V2loB=1i@X$?=AAT8*?E%U36jTf9>sZO6t7fsoWQX>=VUnq
z<sg_dL!1d>Ie}#*JWI1IL9sZ&VkC<a49hc&gkxw4%Mf-3rx=W45R5TEj2@yHX%$D)
zEbU}z+)m>Zt<*c6oYToV3A+=wJ2A@PVC{AZV<#OH#ZVMYkTgNiIPS!89K#$KN}-qo
zMJ09%N?9y+3qm0lJAz0k1eTD9nLyMC3{x;n!Vn4TQCMMyU=o5Pgc%~uW(i?7VP+*{
zG7%;dZZJqNy<UPwMPX{S1XW2?sB)4;skA5+h!TJmN{d1vK@<Q2OoD;`^PdYuPd1ak
z04O}bBgNe0?h}2VD*_g*8`t{!1+G%AY);lgE%TBNOysX^*c2Kbci>Iaou2l=#=u}O
z+G^?tfNXie+l0oB7SLFgUb42aqr;eMq9$@f*Zk0y+!%gWTap$qGa|f~_^V*u-In+B
zpP&2SW<a_vK{i%3aOg?onf%ioai_Vi_0<hAzg5oO@y*ajOHruey=U8oZ9W4x`_|nl
z%sRhi>ii``L4RbXRvt6jbC2A@y8=gdc~3KfA!*zE7dpVF{voNYNmF|pBO5d;D|(X^
zx79iTSXRBg<e)6!#r^Dw-lE-uUHAKsKL(8P<%=F&D7EI+8RO(W-hQ3P$4ZT*?)i-K
z3q4I6<E|b5G1=ksU3JaK_%V6Ct114<<=t;H&+@;nxiXABA}`i%gyi#NUjDwCirm$H
zOI!~=2gAp6*56QP*w7o`<0;_W^6|V{-DdCpTCG*#`m9Y~LmD@xKWyFq;h0aA%ufqk
z^)c)SMP#G?CH?zjV!l#k1!@kf!YYiWye#=5C?LE-E4vB=Qp&yWta_XnKXX;8p%2u4
z(vVb|bn4>h(PE(6t8f-GBPFN0EG4Wd?UfD8fN2{Tk{#47Yswo<*__rKJyVfqetoDT
zm^=}o)Kt1M!@%m+nj?pIy}lj+?2#9qENwGd`@Ivto;5pc-@)~&vSq1;0(;#<&!t0f
zbHcL)O?dlxS7(K`@X5YX-EBMwrqttk))nd+Rl2Ju!?9t^m=IL2N@~>XRNrfC_%wDT
zC4%a7auL+7IcLy}g1v*OToJZ4WVQAC_LdhNLQ(7M!rx=&Sff)y=>+TY&Qn{12wPtB
zkhU0kb$MrD+myD*(t)dqBivE&OO0<1c>Gd(pI7aQZ?DVR7W;+e_x23<7oQ9M`MP(G
z>gBcJ%;&n0Sowplfq?0qfg5xuSAug47lhIwuj!R#x1tI)Nx_k0<?+GA-GgVLFZ}8>
z!*51#AHSt#w$Zy=_U!dds4w!LKwY*Tg*Lyc{G4-pR_B=ipD}-f_dH;1=i;B9*2}kq
yu9%Yja+7Udi0+rz>Cw9THTQPwYUbaGyX2bo?zNZ))Xvr8rW3U>Z^vaaVEI1}_k(Nz

literal 0
HcmV?d00001

diff --git a/themes/wilma/i18n/images/select_locale_en.GIF b/themes/wilma/i18n/images/select_locale_en_US.GIF
similarity index 100%
rename from themes/wilma/i18n/images/select_locale_en.GIF
rename to themes/wilma/i18n/images/select_locale_en_US.GIF
diff --git a/themes/wilma/i18n/images/select_locale_es.GIF b/themes/wilma/i18n/images/select_locale_es_ES.GIF
similarity index 100%
rename from themes/wilma/i18n/images/select_locale_es.GIF
rename to themes/wilma/i18n/images/select_locale_es_ES.GIF
diff --git a/themes/wilma/i18n/images/select_locale_es_MX.GIF b/themes/wilma/i18n/images/select_locale_es_MX.GIF
new file mode 100644
index 0000000000000000000000000000000000000000..11c25782ba3452ebcc14221e15137027ab8356ba
GIT binary patch
literal 1296
zcmeH`|4$r67{>Q(g#(H?!NxnJmJ7D!4r)BK%7KmTX<Imu;95ktXgQA1hV>HKA=a>%
z&|@vMo!V9=E!C-9OQ#adB+zyfzhs*$)}^GnrL?S}>IQ>#K@-m!<nT*^d+HDV5kC23
z=6#>c`y?~TY$@AZ<P8)tPA1NH788mu#^dpSH?xYxV<tx2&|`_lh{cSUp~W;U20)Al
z|MW&oHxe>e&CpF$L(>dZHB{LEf&qXY({w}AT^`-((w$D-ZerJMcJq)X6OCd`gsQHX
zjjEbZRgqMMs+6iMtNQ(lt}2>|qNuW>Qbmyzg(|WMQ3#SXRn`<)B{IP>0x}FrnmJD-
zg-9}%h$tZ-Azm_l$VviBRf#Hy%8+6}5uhSR1&*l5oF_6Q6cUjorX#R~_YuxTI44#p
z{yW`_!xF@jh>3_X#3G9YKawz#5Rw3*2vLYcfJ{^HA>c*4i3h3_$^c3L5&|)T2tt8}
zybE$R$l4)m6R99lAesW481#rirx>)0oKs|Ng5N6m8NtT@3IQenBOnF=YXvL={0uOC
zFT)ds$CSq`4}*Nr#rqlF#{@;5Lw+-k<9+6RSb=4M-;aS4arOkP4YADs`p*j#B<jRp
zV62ObB_+FbFmkEGn(4l;KM#G{Y0E918;+d*?4UjW?2$`DeIthp>#fVy4V)S6&MQ|f
z(R1YL@q(2{ay<2oU)=jdNL}VBB-gt01F4~uz}f44rF-W8{O!@1s#BY~{ne>m4?W*o
z*?SRrtKHWIYKEHLyfyLT_~3?-;qSQlnVJuFKHFHG)*jk6&^-OtJ74`0wVc~?=;B2F
z{i{1NYd^G34z3%VI^TMJzRuY{_TJN-^SIeDai?xr*ydg+Ty;<5=RNa}G){Vd-ZA`=
zqxQt^tQ*d<3htKtM{!~Kl7iN`$QxH4|9*Y?izP~0@nhx7>s~MQrr(ASuD91eyykkz
zPdKSEJNoO+jE3@E6+5_W&yDEe&Tm4W^qrjkwk-VQ_Lhikw{kSsw`FFk-JTY$Io1}S
za~;Xm%^9T*{zA^CjH;!lEcT~vN-M%Ou7%5%&0hyb*F;*zyH<sYs`jTc7nBDY^r4&K
zOm~HEG~;+}eX_&dH57jB>aHtWtCGg<EKP%#pR;Bk9L(9b@|lozx^1mvES%NSzBk$N
z?!wVpw6XHURC#(&^e$ULe{@4I5WYKWd+;NBZ_kSH+i&lEIb{-^{J3m(^{Z{}FB@O+
zBpooewjNmCkCVr}4Ux6K&+gAdFEq`P(?ui3l3a0W_Wj7d)M4M5V@*G7v{;yuzW^ry
B5!V0!

literal 0
HcmV?d00001

diff --git a/themes/wilma/i18n/images/select_locale_fr.GIF b/themes/wilma/i18n/images/select_locale_fr.GIF
deleted file mode 100644
index 7a80e91a91411dfdd7db701fe44a0586dcff64d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmZ?wbhEHbG+<C<_|9PX9|)d5{|*GtpTB<(B%VLNcJ1E1=hqCKu4!6c6HvUy0Ynnl
z7$nXGC7*NhIwxUxPC)aVfZ{n0iE|7R$Gn1$Ie8tk^lE8oNlu>P<kVtm2}IR~hAjdD
z*&H0n3=BXN#V`s+Lts#bfDXu2puE7q@t?tvL&jsnf`iQ*!a`>bEL?cFo!?kS!(rp1
zqg`w=F%<_kE_Uw|WhwgMuxW|sWNC&KF()UbHn0eb`E+;&KWk#;QR?_3(3En1zD@nI
z9M6!a-fSL|wR~44r2EecsOQp+`tp>8&3I$h-mVb!wu$P8KgoDqO>J75G12TVmuc3O
zm8oar&RT_MU!R-g-=-ife&FI3@9Rxxql@zIPpxM(E`4=5mt#l!+N8D7-}Ryowf;Qj
zyJkk?gKZ8=`)qSWo;_JxR%}!zQ(}^NvLrBCuIJ{5*PG{FUB`F#R$0pBjoPdC_1ygW
z{?4wOc2ED_sEEHYCAeC4=N-c*&krmvmi3#xA^*(@+xKPL-qjSBUAetn{QJtCI_XE}
zuWsL$SGVrll2=dn>%RY2^X2C2kM38i8;)MTQNtAWbbihq)*o{#AJ%TW*ZkMjLas@K
zZ^wdySH3sqwTWq!Kd6(`%8;-65$o}&ovUp{BRgZB!+~rLmjw<iX3r`XGub#TxX|yw
KW*OkXU=0AWc<{Uc


From 31c7a968c86122115db7787e43b66cc79802a1b3 Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 14:42:27 -0600
Subject: [PATCH 3/8]  * themes/wilma/i18n/ added property files for storing
 theme dependent translations  * themes/wilma/templates/footer.ftl replaced
 english words with i18n variables

---
 themes/wilma/i18n/all.properties    | 12 ++++++++++++
 themes/wilma/i18n/all_es.properties | 13 +++++++++++++
 themes/wilma/templates/footer.ftl   | 14 +++++++-------
 3 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 themes/wilma/i18n/all.properties
 create mode 100644 themes/wilma/i18n/all_es.properties

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
new file mode 100644
index 00000000..631f31f7
--- /dev/null
+++ b/themes/wilma/i18n/all.properties
@@ -0,0 +1,12 @@
+#
+# Text strings for the controllers and templates
+#
+# Default (English)
+#
+
+menu_termuse = Terms of Use
+menu_powered = Powered by
+menu_about = About
+menu_contactus = Contact Us
+menu_support = Support
+menu_version = Version
\ No newline at end of file
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
new file mode 100644
index 00000000..2c1fee12
--- /dev/null
+++ b/themes/wilma/i18n/all_es.properties
@@ -0,0 +1,13 @@
+#
+# Text strings for the controllers and templates
+#
+# Spanish - 
+#
+# TODO: verify translations from Google Translate are correct
+
+menu_termuse = Términos de uso
+menu_powered = Desarrollado por
+menu_about = Respecto a
+menu_contactus = Contáctenos
+menu_support = Apoyar
+menu_version = Versión
\ No newline at end of file
diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index ba54d9e8..6d24ad15 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/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="terms of use">Terms of Use</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n.menu_termuse}">${i18n.menu_termuse}</a></small> | 
         </#if>
-        Powered by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="powered by 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>
-             | 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="about">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="contact us">Contact Us</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="support">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>

From 57c3bf343473799bbe92af2a6890bf1ce73549c0 Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 15:46:51 -0600
Subject: [PATCH 4/8]  * ../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    | 14 +++++++++++++-
 themes/wilma/i18n/all_es.properties | 18 +++++++++++++++++-
 themes/wilma/templates/footer.ftl   | 14 +++++++-------
 themes/wilma/templates/identity.ftl | 19 ++++++++++---------
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index 631f31f7..7b3a01f9 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -9,4 +9,16 @@ menu_powered = Powered by
 menu_about = About
 menu_contactus = Contact Us
 menu_support = Support
-menu_version = Version
\ No newline at end of file
+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
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index 2c1fee12..314905e6 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -10,4 +10,20 @@ menu_powered = Desarrollado por
 menu_about = Respecto a
 menu_contactus = Contáctenos
 menu_support = Apoyar
-menu_version = Versión
\ No newline at end of file
+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
diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index 6d24ad15..7aa1ab03 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/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>
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index 5cb2a278..47d5848d 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/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>
         

From 28a7c0dffccc5f15c4ea64fda6e6f53c65918e5a Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 16:11:44 -0600
Subject: [PATCH 5/8]  * themes/wilma/i18n added copyright  * ..footer.ftl
 fixed elements identified by ruby script

---
 themes/wilma/i18n/all.properties    | 1 +
 themes/wilma/i18n/all_es.properties | 2 ++
 themes/wilma/templates/footer.ftl   | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index 7b3a01f9..bbdaa09d 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -10,6 +10,7 @@ menu_about = About
 menu_contactus = Contact Us
 menu_support = Support
 menu_version = Version
+menu_copyright = copyright
 
 menu_logout = Log out
 menu_login = Log in
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index 314905e6..c73a79b0 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -11,6 +11,8 @@ menu_about = Respecto a
 menu_contactus = Contáctenos
 menu_support = Apoyar
 menu_version = Versión
+menu_copyright = derechos de autor
+
 
 menu_login = Iniciar la sesión
 menu_loginfull = Iniciar sesión para administrar este sitio
diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index 7aa1ab03..50b01a94 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/themes/wilma/templates/footer.ftl
@@ -7,7 +7,7 @@
         <#if copyright??>
             <small>&copy;${copyright.year?c}
             <#if copyright.url??>
-                <a href="${copyright.url}" title="copyright">${copyright.text}</a>
+                <a href="${copyright.url}" title="${i18n().menu_copyright}">${copyright.text}</a>
             <#else>
                 ${copyright.text}
             </#if>
@@ -15,7 +15,7 @@
         </#if>
         ${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="${i18n().menu_version}">${version.label}</a>
         </#if>
     </p>
     

From 456c986d0e35706edd57d66a6ae462660bfe306f Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 16:28:38 -0600
Subject: [PATCH 6/8]  * themes/wilma/i18n/ added properties for
 individual--foaf-person  * ../individual--foaf-person.ftl added return to and
 for translations

---
 themes/wilma/i18n/all.properties                   | 3 +++
 themes/wilma/i18n/all_es.properties                | 2 ++
 themes/wilma/templates/individual--foaf-person.ftl | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index bbdaa09d..a29e360e 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -23,3 +23,6 @@ identity_admin = Site Admin
 identity_myprofile = My profile
 identity_myaccount = My account
 identity_user = user
+
+indiv_foafperson_for = for
+indiv_foafperson_return = return to
\ No newline at end of file
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index c73a79b0..df2af738 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -24,6 +24,8 @@ identity_myprofile = Mi encuesta
 identity_myaccount = Mi cuenta
 identity_user = usuario
 
+indiv_foafperson_for = para
+
 #Items Vetted by Pedro
 #
 menu_logout = Terminar 
diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl
index 7347a973..ff082fd4 100644
--- a/themes/wilma/templates/individual--foaf-person.ftl
+++ b/themes/wilma/templates/individual--foaf-person.ftl
@@ -50,8 +50,8 @@
         
         <header>
             <#if relatedSubject??>
-                <h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
-                <p><a href="${relatedSubject.url}" title="return to">&larr; return to ${relatedSubject.name}</a></p>
+                <h2>${relatedSubject.relatingPredicateDomainPublic} ${i18n.indiv_foafperson_for} ${relatedSubject.name}</h2>
+                <p><a href="${relatedSubject.url}" title="${i18n.indiv_foafperson_return}">&larr; ${i18n.indiv_foafperson_return} ${relatedSubject.name}</a></p>
             <#else>                
                 <h1 class="vcard foaf-person">
                     <#-- Label -->

From 7657a4b23ca33e61bd11ceee21ce79923641d421 Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 16:39:02 -0600
Subject: [PATCH 7/8] i18n changes for menu.ftl

---
 themes/wilma/i18n/all.properties    | 2 ++
 themes/wilma/i18n/all_es.properties | 3 ++-
 themes/wilma/templates/menu.ftl     | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index a29e360e..b3ced26b 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -11,6 +11,8 @@ menu_contactus = Contact Us
 menu_support = Support
 menu_version = Version
 menu_copyright = copyright
+menu_item = menu item
+menu_welcomestart = Welcome
 
 menu_logout = Log out
 menu_login = Log in
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index df2af738..335c0224 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -12,7 +12,8 @@ menu_contactus = Contáctenos
 menu_support = Apoyar
 menu_version = Versión
 menu_copyright = derechos de autor
-
+menu_item = elemento de menú
+menu_welcomestart = Welcome
 
 menu_login = Iniciar la sesión
 menu_loginfull = Iniciar sesión para administrar este sitio
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index bbbea8e6..71da4e1f 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -5,14 +5,14 @@
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
-            <li role="listitem"><a href="${item.url}" title="${item.linkText} menu item" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
+            <li role="listitem"><a href="${item.url}" title="${item.linkText} ${i18n().menu_item}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
         </#list>
     </ul>
 </nav>
 
 <div id="wrapper-content" role="main">        
     <#if flash?has_content>
-        <#if flash?starts_with("Welcome") >
+        <#if flash?starts_with(i18n().menu_welcomestart) >
             <section  id="welcome-msg-container" role="container">
                 <section  id="welcome-message" role="alert">${flash}</section>
             </section>

From d64450246e280812bc1d2af96b53b905bad9043b Mon Sep 17 00:00:00 2001
From: "Stephen V. Williams" <svwilliams@gmail.com>
Date: Sat, 27 Apr 2013 16:57:34 -0600
Subject: [PATCH 8/8]  * ../page-home.ftl changed most english terms and
 paragraphs TODO finish after mockup completed and code replaces hardcoding  *
 themes/wilma/i18n variables for page-home

---
 themes/wilma/i18n/all.properties     |  8 +++++++-
 themes/wilma/i18n/all_es.properties  |  8 +++++++-
 themes/wilma/templates/page-home.ftl | 10 +++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index b3ced26b..f972565b 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -27,4 +27,10 @@ identity_myaccount = My account
 identity_user = user
 
 indiv_foafperson_for = for
-indiv_foafperson_return = return to
\ No newline at end of file
+indiv_foafperson_return = return to
+
+intro_title = Welcome to VIVO
+intro_para1 = VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.
+intro_para2 = Browse or search information on people, departments, courses, grants, and publications.
+intro_searchvivo = Search VIVO
+intro_filtersearch = Filter search
\ No newline at end of file
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index 335c0224..78f764c8 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -13,7 +13,7 @@ menu_support = Apoyar
 menu_version = Versión
 menu_copyright = derechos de autor
 menu_item = elemento de menú
-menu_welcomestart = Welcome
+menu_welcomestart = Bienvenido
 
 menu_login = Iniciar la sesión
 menu_loginfull = Iniciar sesión para administrar este sitio
@@ -27,6 +27,12 @@ identity_user = usuario
 
 indiv_foafperson_for = para
 
+intro_title = Bienvenido a VIVO
+intro_para1 = VIVO es una herramienta de descubrimiento de la investigación centrada en que permite la colaboración entre los científicos de todas las disciplinas.
+intro_para2 = Explore o busque información sobre las personas, departamentos, cursos, becas y publicaciones.
+intro_searchvivo = Buscar VIVO
+intro_filtersearch = búsqueda Filtrar
+
 #Items Vetted by Pedro
 #
 menu_logout = Terminar 
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index 16696db2..6a466298 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -16,13 +16,13 @@
 
 
         <section id="intro" role="region">
-            <h2>Welcome to VIVO</h2>
+            <h2>${i18n().intro_title}</h2>
 
-            <p>VIVO is a research-focused discovery tool that enables collaboration among scientists across all disciplines.</p>
-            <p>Browse or search information on people, departments, courses, grants, and publications.</p>
+            <p>${i18n().intro_para1}</p>
+            <p>${i18n().intro_para2}Browse or search information on people, departments, courses, grants, and publications.</p>
 
             <section id="search-home" role="region">
-                <h3>Search VIVO <span class="search-filter-selected">filteredSearch</span></h3>
+                <h3>${i18n().intro_searchvivo} <span class="search-filter-selected">filteredSearch</span></h3>
         
                 <fieldset>
                     <legend>Search form</legend>
@@ -32,7 +32,7 @@
                             <input type="submit" value="Search" class="search" />
                         </div>
                 
-                        <a class="filter-search filter-default" href="#" title="Filter search"><span class="displace">filter search</span></a>
+                        <a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}"><span class="displace">${i18n().intro_filtersearch}</span></a>
                 
                         <ul id="filter-search-nav">
                             <li><a class="active" href="">All</a></li>