<#if statement.street1?has_content>
-
+
#if>
<#if statement.street2?has_content>
<#if !statement.street1?has_content>
-
+
<#else>
${statement.street2}
#if>
@@ -30,7 +30,7 @@
<#if statement.street3?has_content>
<#if !statement.street1?has_content && !statement.street2?has_content>
-
+
<#else>
${statement.street3}
#if>
@@ -64,7 +64,7 @@
<#elseif statement.editable>
<#-- This can be removed when the custom form is available. Until then, provide a link to the
address profile so the data can be edited. -->
-
${statement.label!statement.localName}
+
${statement.label!statement.localName}
<#else>
${statement.label!}
#if>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
index 9874c81f..d5719b82 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
@@ -8,7 +8,6 @@
<#import "lib-sequence.ftl" as s>
<#import "lib-datetime.ftl" as dt>
-
<@showPosition statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
@@ -26,10 +25,10 @@
<#else>
<#local linkedIndividual>
<#if statement.person??>
-
${statement.personName}
+
${statement.personName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
-
missing person in this position
+
${i18n().missing_person_in_posn}
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index e26bcf57..76c2feff 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -8,7 +8,6 @@
<#import "lib-sequence.ftl" as s>
<#import "lib-datetime.ftl" as dt>
-
<@showTraining statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
@@ -17,10 +16,10 @@
<#local linkedIndividual>
<#if statement.person??>
-
${statement.personName}
+
${statement.personName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
-
missing person in this position
+
${i18n().missing_person_in_posn}
#if>
#local>
<#local detailedInfo>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
index 43594c5d..fa0afb41 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
@@ -8,7 +8,6 @@
<#import "lib-sequence.ftl" as s>
<#import "lib-datetime.ftl" as dt>
-
<@showPosition statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
@@ -17,17 +16,17 @@
<#local linkedIndividual>
<#if statement.org??>
-
${statement.orgName}
+
${statement.orgName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
-
missing organization
+
${i18n().missing_organization}
#if>
#local>
<#-- The sparql query returns both the org's parent (middleOrg) and grandparent (outerOrg).
For now, we are only displaying the parent in the list view. -->
<#local middleOrganization>
<#if statement.middleOrg??>
-
${statement.middleOrgName!}
+
${statement.middleOrgName!}
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index e198cd01..16cacbaf 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -21,7 +21,7 @@
${statement.indivLabel!statement.indivName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
-
missing person in this role
+
${i18n().missing_person_in_role}
#if>
#local>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
index a7ca7fa1..2dbf53ed 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
@@ -7,14 +7,13 @@
-->
<#import "lib-sequence.ftl" as s>
-
<@showResearchers statement />
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showResearchers statement>
<#local linkedIndividual>
-
${statement.personName}
+
${statement.personName}
#local>
<#if statement.title?has_content >
<#local posnTitle = statement.title>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
index b7d5033b..9ac91778 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-scopusId.ftl
@@ -5,11 +5,10 @@
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
-->
-
<@showStatement statement />
<#macro showStatement statement>
-
${statement.value!}
+
${statement.value!}
#macro>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
index 687851de..725603c6 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl
@@ -12,7 +12,6 @@
*** element that contains the web page snap shot, as shown below in the template. Note that this code is ***
*** currently commented out and a placeholder is displayed instead. ***
-->
-
<#assign count = property.statements?size!>
<#assign identifier>
@@ -42,29 +41,29 @@
The assumption is made that the service will require the url of the web page and possibly
an image size as well.
-
Loading website image. . . 
-
-
+${strings.loading_website_image}. . .
+
+
<#if imgSize == "" >
-
-
+
+
<#else>
-
-
+
+
#if>
-->
<#-- Here is the placeholder link -->
- ${linkText}
+ ${linkText}
<#else>
- ${statement.linkName} (no url provided for link)
+ ${statement.linkName} (${i18n().no_url_provided})
#if>
#macro>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
index b1515f73..55084052 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl
@@ -14,7 +14,7 @@
<#if statement.url?has_content>
- ${linkText}
+ ${linkText}
<#else>
- ${statement.linkName} (no url provided for link)
+ ${statement.linkName} (${i18n().no_url_provided})
#if>
\ No newline at end of file
diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index f972565b..6cb3f262 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -33,4 +33,131 @@ 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
+intro_filtersearch = Filter search
+
+#
+# List view ("propStatement-") templates
+#
+advisee_label = advisee label
+candidate = candidate
+advisory_label = advisory label
+
+resource_name = resource name
+missing_info_resource = missing information resource
+
+award_receipt_name = award receipt name
+award_name = award name
+conferred_by = conferred by
+
+incomplete_date_time = incomplete date time
+
+organization_name = organization name
+missing_organization = missing organization
+middle_organization = middle organization
+
+concept_name = concept name
+
+event_name = event name
+missing_event = missing event
+event_label = event label
+
+activity_name = activity name
+missing_activity = missing activity
+awarded_by = awarded by
+administered_by = administered by
+
+presentation_name = presentation name
+missing_presentation = missing presentation
+conference = conference
+series = series
+
+author_name = author name
+missing_author = missing author
+
+address_street_one = address street one
+address_street_two = address street two
+address_street_three = address street three
+address_label = address label
+
+person_name = person name
+missing_person_in_posn = missing person in this position
+missing_person_in_role = missing person in this role
+
+scopus_id_link = Scopus ID Link
+
+loading_website_image = Loading website image
+click_to_view_web_page = Click to view the {0} web page
+screenshot_of_webpage = screenshot of webpage {0}
+click_webpage_icon = click webpage icon
+link_text = link text
+link_name = link name
+no_url_provided = no url provided for link
+
+#
+# "partial" individual templates ( /templates/freemarker/body/partials/individual )
+#
+contact_capitalized = Contact
+primary_email = primary email
+additional_emails = additional emails
+email = email
+primary_email_capitalized = Primary Email
+additional_emails_capitalized = Additional Emails
+contact_info = Contact Info
+
+active_grants_for = Active Grants for
+grant_name = Grant Name
+close_date = Close Date
+no_active_grants = There are currently no active grants for this department.
+view_all_active_grants = View all active grants
+
+faculty_who_are_members_of_org = Here are the faculty in the {0} department who are members of this organization.
+view_all_faculty = view all faculty
+view_all_members_of_org = View all the members of this organization.
+
+faculty_memberships = Faculty Memberships
+faculty_with_researh_area = Here are the faculty members in the {0} department who have an interest in this research area.
+view_all_faculty_in_area = View all faculty members with an interest in this area.
+
+faculty_research_areas = Faculty Research Areas
+research_area = research area
+display_more = more
+display_less = less
+
+share_the_uri = share the uri
+
+export_qr_codes = Export QR codes
+vcard_qr_code = vCard QR Code
+qr_icon = qr icon
+qr_code = QR Code
+invalid_qr_code_parameter = You have passed an invalid value for the qrCode display parameter.
+
+research_areas = research areas
+
+publications_in_vivo = Publications in VIVO
+co_author = co-author
+co_author_network = Co-author Network
+map_of_science = map of science
+map_of_science_capitalized = Map of Science
+co_investigator_network = co-investigator network
+co_investigator_network_capitalized = Co-investigator Network
+
+networks = Networks
+co_authors = Co-authors
+
+temporal_graph = temporal graph
+temporal_graph_capitalized = Temporal Graph
+
+websites = Websites
+
+#
+# individual templates ( /templates/freemarker/body/individual )
+#
+standard_view = Standard profile view
+quick_view = Quick profile view
+quick_view_icon = quick view icon
+geographic_focus = Geographic Focus
+
+manage_labels = Manage Labels
+manage_labels_intro = Multiple labels exist for this profile but there should only be one. Select the label you want displayed on the profile page, and the others will be deleted.
+processing_icon = processing
+selection_in_process = Your selection is being processed.
diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties
index 78f764c8..b9c71bb3 100644
--- a/themes/wilma/i18n/all_es.properties
+++ b/themes/wilma/i18n/all_es.properties
@@ -38,3 +38,132 @@ intro_filtersearch = búsqueda Filtrar
menu_logout = Terminar
identity_admin = Administrador
+
+# Following need translations
+#
+#
+# List view ("propStatement-") templates
+#
+advisee_label = translate: advisee label
+candidate = translate: candidate
+advisory_label = translate: advisory label
+
+resource_name = translate: resource name
+missing_info_resource = translate: missing information resource
+
+award_receipt_name = translate: award receipt name
+award_name = translate: award name
+conferred_by = translate: conferred by
+
+incomplete_date_time = translate: incomplete date time
+
+organization_name = translate: organization name
+missing_organization = translate: missing organization
+middle_organization = translate: middle organization
+
+concept_name = translate: concept name
+
+event_name = translate: event name
+missing_event = translate: missing event
+event_label = translate: event label
+
+activity_name = translate: activity name
+missing_activity = translate: missing activity
+awarded_by = translate: awarded by
+administered_by = translate: administered by
+
+presentation_name = translate: presentation name
+missing_presentation = translate: missing presentation
+conference = translate: conference
+series = translate: series
+
+author_name = translate: author name
+missing_author = translate: missing author
+
+address_street_one = translate: address street one
+address_street_two = translate: address street two
+address_street_three = translate: address street three
+address_label = translate: address label
+
+person_name = translate: person name
+missing_person_in_posn = translate: missing person in this position
+missing_person_in_role = translate: missing person in this role
+
+scopus_id_link = translate: Scopus ID Link
+
+loading_website_image = translate: Loading website image
+click_to_view_web_page = translate: Click to view the {0} web page
+screenshot_of_webpage = translate: screenshot of webpage {0}
+click_webpage_icon = translate: click webpage icon
+link_text = translate: link text
+link_name = translate: link name
+no_url_provided = translate: no url provided for link
+
+#
+# "partial" individual templates ( /templates/freemarker/body/partials/individual )
+#
+contact_capitalized = translate: Contact
+primary_email = translate: primary email
+additional_emails = translate: additional emails
+email = translate: email
+primary_email_capitalized = translate: Primary Email
+additional_emails_capitalized = translate: Additional Emails
+contact_info = translate: Contact Info
+
+active_grants_for = translate: Active Grants for
+grant_name = translate: Grant Name
+close_date = translate: Close Date
+no_active_grants = translate: There are currently no active grants for this department.
+view_all_active_grants = translate: View all active grants
+
+faculty_who_are_members_of_org = translate: Here are the faculty in the {0} department who are members of this organization.
+view_all_faculty = translate: view all faculty
+view_all_members_of_org = translate: View all the members of this organization.
+
+faculty_memberships = translate: Faculty Memberships
+faculty_with_researh_area = translate: Here are the faculty members in the {0} department who have an interest in this research area.
+view_all_faculty_in_area = translate: View all faculty members with an interest in this area.
+
+faculty_research_areas = translate: Faculty Research Areas
+research_area = translate: research area
+display_more = translate: more
+display_less = translate: less
+
+share_the_uri = translate: share the uri
+
+export_qr_codes = translate: Export QR codes
+vcard_qr_code = translate: vCard QR Code
+qr_icon = translate: qr icon
+qr_code = translate: QR Code
+invalid_qr_code_parameter = translate: You have passed an invalid value for the qrCode display parameter.
+
+research_areas = translate: research areas
+
+publications_in_vivo = translate: Publications in VIVO
+co_author = translate: co-author
+co_author_network = translate: Co-author Network
+map_of_science = translate: map of science
+map_of_science_capitalized = translate: Map of Science
+co_investigator_network = translate: co-investigator network
+co_investigator_network_capitalized = translate: Co-investigator Network
+
+networks = translate: Networks
+co_authors = translate: Co-authors
+
+temporal_graph = translate: temporal graph
+temporal_graph_capitalized = translate: Temporal Graph
+
+websites = translate: Websites
+
+#
+# individual templates ( /templates/freemarker/body/individual )
+#
+standard_view = translate: Standard profile view
+quick_view = translate: Quick profile view
+quick_view_icon = translate: quick view icon
+geographic_focus = translate: Geographic Focus
+
+manage_labels = translate: Manage Labels
+manage_labels_intro = translate: Multiple labels exist for this profile but there should only be one. Select the label you want displayed on the profile page, and the others will be deleted.
+processing_icon = translate: processing
+selection_in_process = translate: Your selection is being processed.