From 47466e98cc35d8e4ca6c5e5b70efe5773432f921 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 13 May 2013 12:10:57 -0400 Subject: [PATCH] template changes for internationalization -- replaced displayed text with calls to properties file containing actual strings --- .../individual--foaf-organization.ftl | 4 +- .../individual--foaf-person-2column.ftl | 10 +- .../individual--foaf-person-quickview.ftl | 12 +- .../individual/individual--foaf-person.ftl | 17 +-- .../individual/individual-adminPanel.ftl | 23 ---- .../individual-contactInfo-2column.ftl | 8 +- .../individual/individual-contactInfo.ftl | 8 +- .../individual-dept-active-grants.ftl | 10 +- .../individual-dept-membership-details.ftl | 4 +- .../individual-dept-memberships.ftl | 4 +- .../individual-dept-res-area-details.ftl | 4 +- .../individual-dept-research-areas.ftl | 8 +- .../individual/individual-iconControls.ftl | 9 +- .../individual/individual-qrCodeGenerator.ftl | 8 +- .../individual/individual-researchAreas.ftl | 2 +- .../individual-visualizationFoafPerson.ftl | 14 +- .../individual-visualizationMapOfScience.ftl | 2 +- .../individual-visualizationQuickView.ftl | 8 +- .../individual-visualizationTemporalGraph.ftl | 2 +- .../individual/individual-webpage.ftl | 4 +- .../individual/propStatement-advisorIn.ftl | 8 +- .../propStatement-authorInAuthorship.ftl | 6 +- .../individual/propStatement-awardOrHonor.ftl | 6 +- .../propStatement-dateTimeInterval.ftl | 2 +- .../propStatement-dateTimeValue.ftl | 2 +- .../individual/propStatement-default.ftl | 2 +- .../propStatement-educationalTraining.ftl | 9 +- .../propStatement-hasAssociatedConcept.ftl | 5 +- .../propStatement-hasAttendeeRole.ftl | 9 +- .../propStatement-hasEditReviewRole.ftl | 3 +- .../propStatement-hasInvestigatorRole.ftl | 9 +- .../propStatement-hasPresenterRole.ftl | 8 +- .../individual/propStatement-hasRole.ftl | 5 +- ...tement-informationResourceInAuthorship.ftl | 5 +- .../propStatement-mailingAddress.ftl | 8 +- .../propStatement-organizationForPosition.ftl | 5 +- .../propStatement-organizationForTraining.ftl | 5 +- .../propStatement-personInPosition.ftl | 7 +- .../individual/propStatement-relatedRole.ftl | 2 +- .../propStatement-researchAreaOf.ftl | 3 +- .../individual/propStatement-scopusId.ftl | 3 +- .../propStatement-webpage-quickview.ftl | 19 ++- .../individual/propStatement-webpage.ftl | 4 +- themes/wilma/i18n/all.properties | 129 +++++++++++++++++- themes/wilma/i18n/all_es.properties | 129 ++++++++++++++++++ 45 files changed, 381 insertions(+), 173 deletions(-) delete mode 100644 productMods/templates/freemarker/body/partials/individual/individual-adminPanel.ftl diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl index afc0e2a8..7186077d 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-organization.ftl @@ -17,8 +17,8 @@ <#assign departmentalGrantsExtension> diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index fe709e78..49cfbaf4 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -36,7 +36,7 @@
<#if relatedSubject??>

${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

-

← return to ${relatedSubject.name}

+

← ${i18n().return_to(relatedSubject.name)}

<#else>

style="float:left;border-right:1px solid #A6B1B0;"> <#-- Label --> @@ -68,8 +68,8 @@

@@ -94,7 +94,7 @@
<#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

Websites <@p.addLink webpage editable ""/>

+

${i18n().websites} <@p.addLink webpage editable ""/>

<@p.verboseDisplay webpage /> <#assign localName = webpage.localName>
    @@ -120,7 +120,7 @@ <#if targetedView?has_content || user.loggedIn > - full view icon + ${i18n().quick_view_icon} diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl index e081601f..281eaa14 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl @@ -46,7 +46,7 @@
    <#if relatedSubject??>

    ${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}

    -

    ← return to ${relatedSubject.name}

    +

    ← ${i18n().return_to(relatedSubject.name)}

    <#else> <#-- Image -->
    ${individualImage}
    @@ -84,8 +84,8 @@

@@ -102,7 +102,7 @@ <#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if editable> -

Websites <@p.addLink webpage editable ""/>

+

${i18n().websites} <@p.addLink webpage editable ""/>

<@p.verboseDisplay webpage /> <#assign localName = webpage.localName> @@ -124,7 +124,7 @@ <#assign geographicFocus = propertyGroups.pullProperty("${core}geographicFocus")!> <#if geographicFocus?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> -

Geographic Focus <@p.addLink geographicFocus editable ""/>

+

${i18n().geographic_focus} <@p.addLink geographicFocus editable ""/>

<@p.verboseDisplay geographicFocus /> <#assign localName = geographicFocus.localName> @@ -148,7 +148,7 @@ <#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#if webpage?has_content> -

Websites <@p.addLink webpage editable ""/>

+

${i18n().websites} <@p.addLink webpage editable ""/>

<@p.verboseDisplay webpage /> <#assign localName = webpage.localName>