From 59ddbe15ec1b728b340775e4e99e52deae1db1c4 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Fri, 20 Jun 2014 13:08:55 -0400
Subject: [PATCH] there were duplicate freemarker variables being used;
 resolved this by changing the name of the variable used for the application
 or site name

---
 webapp/languages/es_GO/i18n/all_es_GO.properties    | 13 ++++++-------
 .../freemarker/FreemarkerHttpServlet.java           |  2 +-
 webapp/themes/vitro/templates/head.ftl              |  2 +-
 webapp/web/i18n/all.properties                      | 13 ++++++-------
 webapp/web/templates/freemarker/body/about.ftl      |  2 +-
 .../body/contactForm/contactForm-error.ftl          |  2 +-
 .../body/contactForm/contactForm-form.ftl           |  2 +-
 .../freemarker/body/error/error-display.ftl         |  2 +-
 .../templates/freemarker/body/error/error-email.ftl | 10 +++++-----
 .../freemarker/body/error/error-titled.ftl          |  2 +-
 .../freemarker/body/individual/individual-help.ftl  |  1 -
 .../templates/freemarker/body/individualList.ftl    |  2 +-
 .../body/manageproxies/manageProxies-list.ftl       |  2 +-
 .../menupage/menupage--defaultSearchIndividuals.ftl |  2 +-
 .../menupage--exampleMultipleContentTypes.ftl       |  2 +-
 .../freemarker/body/message/message-titled.ftl      |  2 +-
 .../freemarker/body/partials/dump/dump.ftl          |  2 +-
 webapp/web/templates/freemarker/body/samples.ftl    |  6 +++---
 webapp/web/templates/freemarker/body/test.ftl       |  2 +-
 .../templates/freemarker/body/unrecognizedUser.ftl  |  2 +-
 .../templates/freemarker/page/partials/title.ftl    |  2 +-
 21 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
index 241a38e43..55236387c 100644
--- a/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -226,8 +226,7 @@ verbose_turn_on = Encender
 verbose_turn_off = Apagar
 resource_uri = URI de recursos
 
-individual_not_found = Individual no encontrado:
-entity_to_query_for = Este id es el identificador de la entidad para consultar. netid también funciona.
+individual_not_found = Individual no encontrado
 
 menu_ordering = Menú pedidos
 refresh_page_after_reordering = Actualizar la página después de los artículos de menú reordenar
@@ -324,11 +323,11 @@ we_have_an_error = Se produjo un error en el sistema.
 error_was_reported = Este error se ha informado que la administración del sitio.
 error_message = Mensaje de error
 stack_trace = Seguimiento de la pila
-trace_available = completa rastro disponibles en el registro vivo
+trace_available = completa rastro disponibles en el registro {0}
 caused_by = Causada por
 requested_url = URL solicitada
-error_occurred = Se ha producido un error en el sitio VIVO
-error_occurred_at = Se ha producido un error en su sitio VIVO en {0}.
+error_occurred = Se ha producido un error en el sitio {0}
+error_occurred_at = Se ha producido un error en su sitio {0} en {1}.
 
 #
 # login templates ( /templates/freemarker/body/login )
@@ -414,7 +413,7 @@ undo_camelcasing = Uncamelcasing
 run_sdb_setup = Ejecutar la instalación SDB
 
 unrecognized_user = Usuario no reconocido
-no_individual_associated_with_id = Por alguna razón, no hay ninguna persona en VIVO que se asocia con su ID de red. Tal vez usted debería ponerse en contacto con el administrador de VIVO.
+no_individual_associated_with_id = Por alguna razón, no hay ninguna persona en {0} que se asocia con su ID de red. Tal vez usted debería ponerse en contacto con el administrador de {0}.
 
 #
 # site admin templates ( /templates/freemarker/body/siteAdmin )
@@ -589,7 +588,7 @@ operation_successful = La operación se ha realizado correctamente.
 operation_unsuccessful = La operación no tuvo éxito. Los detalles completos se pueden encontrar en el registro del sistema.
 relate_editors_profiles = Relacionar editores de perfil y los perfiles
 info_icon = info icon
-profile_editing_title = Los editores que seleccione en el lado izquierdo tendrá la posibilidad de editar los perfiles VIVO seleccione en el lado derecho. Puede seleccionar varios editores y varios perfiles, pero debe seleccionar un mínimo de 1 cada uno.
+profile_editing_title = Los editores que seleccione en el lado izquierdo tendrá la posibilidad de editar los perfiles {0} seleccione en el lado derecho. Puede seleccionar varios editores y varios perfiles, pero debe seleccionar un mínimo de 1 cada uno.
 select_editors = Seleccione editores
 select_last_name = Seleccione un apellido existente
 processing_indicator = Indicador de tiempo de procesamiento
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index 665c46eff..e1d4385c8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -440,7 +440,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         
         ApplicationBean appBean = vreq.getAppBean();
         // This may be overridden by the body data model received from the subcontroller.
-        map.put("title", getTitle(vreq.getAppBean().getApplicationName(), vreq));
+        map.put("siteName", getTitle(vreq.getAppBean().getApplicationName(), vreq));
         
         map.put("urls", buildRequestUrls(vreq));
 
diff --git a/webapp/themes/vitro/templates/head.ftl b/webapp/themes/vitro/templates/head.ftl
index 06abc594c..94a035cb4 100644
--- a/webapp/themes/vitro/templates/head.ftl
+++ b/webapp/themes/vitro/templates/head.ftl
@@ -4,7 +4,7 @@
 <!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer-->
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-<title>${title}</title>
+<title>${siteName!}</title>
 
 <#include "stylesheets.ftl">
 <link rel="stylesheet" href="${urls.theme}/css/screen.css" />
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 10ffb706f..85becab28 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -238,8 +238,7 @@ verbose_turn_on = Turn on
 verbose_turn_off = Turn off
 resource_uri = Resource URI
 
-individual_not_found = Individual not found:
-entity_to_query_for = This id is the id of the entity to query for. netid also works.
+individual_not_found = Individual Not Found
 
 menu_ordering = Menu Ordering
 refresh_page_after_reordering = Refresh page after reordering menu items
@@ -336,11 +335,11 @@ we_have_an_error = There was an error in the system.
 error_was_reported = This error has been reported to the site administrator.
 error_message = Error message
 stack_trace = Stack trace
-trace_available = full trace available in the vivo log
+trace_available = full trace available in the {0} log
 caused_by = Caused by
 requested_url = Requested url
-error_occurred = An error occurred on the VIVO site
-error_occurred_at = An error occurred on your VIVO site at {0}.
+error_occurred = An error occurred on the {0} site
+error_occurred_at = An error occurred on your {0} site at {1}.
 
 #
 # login templates ( /templates/freemarker/body/login )
@@ -426,7 +425,7 @@ undo_camelcasing = Uncamelcasing
 run_sdb_setup = Run SDB Setup
 
 unrecognized_user = Unrecognized user
-no_individual_associated_with_id = For some reason, there is no individual in VIVO that is associated with your Net ID. Perhaps you should contact your VIVO administrator.
+no_individual_associated_with_id = For some reason, there is no individual in {0} that is associated with your Net ID. Perhaps you should contact your {0} administrator.
 
 #
 # site admin templates ( /templates/freemarker/body/siteAdmin )
@@ -602,7 +601,7 @@ 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
 info_icon = info icon
-profile_editing_title = The editors you select on the left hand side will have the ability to edit the VIVO profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each.
+profile_editing_title = The editors you select on the left hand side will have the ability to edit the {0} profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each.
 select_editors = Select editors
 select_last_name = Select an existing last name
 processing_indicator = processing time indicator
diff --git a/webapp/web/templates/freemarker/body/about.ftl b/webapp/web/templates/freemarker/body/about.ftl
index 097d26ed6..b39ed69a2 100644
--- a/webapp/web/templates/freemarker/body/about.ftl
+++ b/webapp/web/templates/freemarker/body/about.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for the body of the About page -->
 
-<h2>${title}</h2>
+<h2>${siteName!}</h2>
 
 <#if aboutText?has_content>
     <div class="pageGroupBody" id="aboutText">${aboutText}</div>
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
index 7ca324cca..5409414e5 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
@@ -2,7 +2,7 @@
 
 <#-- Contact form processing errors -->
 
-<h2>${title}</h2>
+<h2>${title!}</h2>
 
 <#if errorMessage?has_content>       
     <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
index b53adb7ae..186e383dc 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
@@ -3,7 +3,7 @@
 <#-- Contact form -->
 
 <section class="staticPageBackground feedbackForm" role="region">
-    <h2>${title}</h2>
+    <h2>${title!}</h2>
     
     <#if errorMessage?has_content>       
         <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
diff --git a/webapp/web/templates/freemarker/body/error/error-display.ftl b/webapp/web/templates/freemarker/body/error/error-display.ftl
index a878bc098..e963a007d 100644
--- a/webapp/web/templates/freemarker/body/error/error-display.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-display.ftl
@@ -15,7 +15,7 @@
     </#if>
     <#if adminErrorData.stackTrace?has_content>
         <p>
-            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): ${adminErrorData.stackTrace?html}
+            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): ${adminErrorData.stackTrace?html}
         </p>
                    
         <#if adminErrorData.cause?has_content>
diff --git a/webapp/web/templates/freemarker/body/error/error-email.ftl b/webapp/web/templates/freemarker/body/error/error-email.ftl
index 9f5b360c6..646501eff 100644
--- a/webapp/web/templates/freemarker/body/error/error-email.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-email.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for email message sent to site administrator when an error occurs on the site. -->
 
-<#assign subject = "${i18n().error_occurred}" />
+<#assign subject = "${i18n().error_occurred(siteName!)}" />
 
 <#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
 
@@ -13,7 +13,7 @@
     </head>
     <body>
         <p>
-            ${i18n().error_occurred_at(datetime!)}
+            ${i18n().error_occurred_at(siteName!,datetime!)}
         </p>
         
         <p>
@@ -27,7 +27,7 @@
         </p>
         
         <p>
-            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): 
+            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): 
             <pre>${stackTrace!}</pre>
         </p>
         
@@ -42,7 +42,7 @@
 </#assign>
 
 <#assign text>
-${i18n().error_occurred_at(datetime!)}
+${i18n().error_occurred_at(siteName!,datetime!)}
 
 ${i18n().requested_url}: ${requestedUrl!}
 
@@ -50,7 +50,7 @@ ${i18n().requested_url}: ${requestedUrl!}
     ${i18n().error_message}: ${errorMessage!}
 </#if>
 
-${i18n().stack_trace} (${i18n().trace_available}): 
+${i18n().stack_trace} (${i18n().trace_available(siteName!)}): 
 ${stackTrace!}
 
 <#if cause?has_content>
diff --git a/webapp/web/templates/freemarker/body/error/error-titled.ftl b/webapp/web/templates/freemarker/body/error/error-titled.ftl
index 9e09d9b87..99886b977 100644
--- a/webapp/web/templates/freemarker/body/error/error-titled.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-titled.ftl
@@ -2,6 +2,6 @@
 
 <#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. -->
 
-<h2>${title}</h2>
+<h2>${title!}</h2>
 
 <#include "error-message.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individual/individual-help.ftl b/webapp/web/templates/freemarker/body/individual/individual-help.ftl
index 09efeeacf..47386ed66 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-help.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-help.ftl
@@ -4,4 +4,3 @@
 
 <h2>${i18n().individual_not_found}</h2>
 
-<p>${i18n().entity_to_query_for}</p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl
index 4746a0a7f..f93d0c72a 100644
--- a/webapp/web/templates/freemarker/body/individualList.ftl
+++ b/webapp/web/templates/freemarker/body/individualList.ftl
@@ -9,7 +9,7 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title} 
+    <h2>${title!} 
         <#if rdfUrl?has_content>
             <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
         </#if>
diff --git a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index 18ad67874..8405b3096 100644
--- a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -22,7 +22,7 @@
 </section>
 
 <section class="proxy-profile">
-    <h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title}" /></h4>
+    <h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title(siteName!)}" /></h4>
     
     <form id="add-relation" action="${formUrls.create}" method="POST">
         <fieldset class="proxy">
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
index 554e78203..3e512beb3 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
@@ -9,7 +9,7 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title} 
+    <h2>${title!} 
     </h2>
     <#if subtitle?has_content>
         <h4>${subtitle}</h4>
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
index bc1af5363..d57ff9705 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
@@ -41,7 +41,7 @@ variableName is used below.-->
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title} 
+    <h2>${title!} 
     </h2>
     <#if subtitle?has_content>
         <h4>${subtitle}</h4>
diff --git a/webapp/web/templates/freemarker/body/message/message-titled.ftl b/webapp/web/templates/freemarker/body/message/message-titled.ftl
index 3e250249f..1ce45a655 100644
--- a/webapp/web/templates/freemarker/body/message/message-titled.ftl
+++ b/webapp/web/templates/freemarker/body/message/message-titled.ftl
@@ -2,6 +2,6 @@
 
 <#-- Standard template to display a message with a title generated from any controller. Keeps this out of individual templates. -->
 
-<h2>${title}</h2>
+<h2>${title!}</h2>
 
 <#include "message.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
index 0024ec507..41203e22a 100644
--- a/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
+++ b/webapp/web/templates/freemarker/body/partials/dump/dump.ftl
@@ -5,7 +5,7 @@
  ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')}
 
 <div class="dump">
-    <h3>${title}</h3>
+    <h3>${title!}</h3>
     
     <#-- dump has been changed to dumpValue to avoid confusion 
     with the dump directive which is stored in the DataModel as 'dump' -->    
diff --git a/webapp/web/templates/freemarker/body/samples.ftl b/webapp/web/templates/freemarker/body/samples.ftl
index 3981bd6b8..49f94ae14 100644
--- a/webapp/web/templates/freemarker/body/samples.ftl
+++ b/webapp/web/templates/freemarker/body/samples.ftl
@@ -5,7 +5,7 @@
 <#import "lib-datetime.ftl" as dt>
 <#import "lib-string.ftl" as str>
 
-<h2>${title}</h2>
+<h2>${title!}</h2>
 
 <@widget name="test" />
 
@@ -57,8 +57,8 @@
 <p>${year?number?c}</p>
 
 <h3>${i18n().raw_string_literals}</h3>
-<p>${r"#{title}"}</p>
-<p>${r"${title}"}</p>
+<p>${r"#{title!}"}</p>
+<p>${r"${title!}"}</p>
 
 <h2>${i18n().containers_do_not_pick_up_changes}</h2>
 <#assign
diff --git a/webapp/web/templates/freemarker/body/test.ftl b/webapp/web/templates/freemarker/body/test.ftl
index 1dc72abb8..a871175dd 100644
--- a/webapp/web/templates/freemarker/body/test.ftl
+++ b/webapp/web/templates/freemarker/body/test.ftl
@@ -2,4 +2,4 @@
 
 <#-- FreeMarker test cases -->
 
-<h2>${title}</h2>
+<h2>${title!}</h2>
diff --git a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
index 8ad90a277..2fd2df0d9 100644
--- a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
+++ b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
@@ -6,7 +6,7 @@
     <h2>${i18n().unrecognized_user}</h2>
     
     <p>
-      ${i18n().no_individual_associated_with_id}
+      ${i18n().no_individual_associated_with_id(siteName!)}
     </p>
 
     <br/>
diff --git a/webapp/web/templates/freemarker/page/partials/title.ftl b/webapp/web/templates/freemarker/page/partials/title.ftl
index d17df2191..0cf24952d 100644
--- a/webapp/web/templates/freemarker/page/partials/title.ftl
+++ b/webapp/web/templates/freemarker/page/partials/title.ftl
@@ -1,3 +1,3 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<title>${title}</title>
\ No newline at end of file
+<title>${siteName!}</title>
\ No newline at end of file