litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name

Browse source
This commit is contained in:
Tim Worrall 2014-06-20 13:08:55 -04:00
parent 90cec22e9d
commit 59ddbe15ec
21 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
webapp/languages/es_GO/i18n/all_es_GO.properties
View file

@ -226,8 +226,7 @@ verbose_turn_on = Encender
verbose_turn_off = Apagar verbose_turn_off = Apagar
resource_uri = URI de recursos resource_uri = URI de recursos
individual_not_found = Individual no encontrado: individual_not_found = Individual no encontrado
entity_to_query_for = Este id es el identificador de la entidad para consultar. netid también funciona.
menu_ordering = Menú pedidos menu_ordering = Menú pedidos
refresh_page_after_reordering = Actualizar la página después de los artículos de menú reordenar 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_was_reported = Este error se ha informado que la administración del sitio.
error_message = Mensaje de error error_message = Mensaje de error
stack_trace = Seguimiento de la pila 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 caused_by = Causada por
requested_url = URL solicitada requested_url = URL solicitada
error_occurred = Se ha producido un error en el sitio VIVO error_occurred = Se ha producido un error en el sitio {0}
error_occurred_at = Se ha producido un error en su sitio VIVO en {0}. error_occurred_at = Se ha producido un error en su sitio {0} en {1}.
# #
# login templates ( /templates/freemarker/body/login ) # login templates ( /templates/freemarker/body/login )
@ -414,7 +413,7 @@ undo_camelcasing = Uncamelcasing
run_sdb_setup = Ejecutar la instalación SDB run_sdb_setup = Ejecutar la instalación SDB
unrecognized_user = Usuario no reconocido 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 ) # 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. 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 relate_editors_profiles = Relacionar editores de perfil y los perfiles
info_icon = info icon 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_editors = Seleccione editores
select_last_name = Seleccione un apellido existente select_last_name = Seleccione un apellido existente
processing_indicator = Indicador de tiempo de procesamiento processing_indicator = Indicador de tiempo de procesamiento

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -440,7 +440,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
ApplicationBean appBean = vreq.getAppBean(); ApplicationBean appBean = vreq.getAppBean();
// This may be overridden by the body data model received from the subcontroller. // 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)); map.put("urls", buildRequestUrls(vreq));

2
webapp/themes/vitro/templates/head.ftl
View file

@ -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--> <!-- 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"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>${title}</title> <title>${siteName!}</title>
<#include "stylesheets.ftl"> <#include "stylesheets.ftl">
<link rel="stylesheet" href="${urls.theme}/css/screen.css" /> <link rel="stylesheet" href="${urls.theme}/css/screen.css" />

13
webapp/web/i18n/all.properties
View file

@ -238,8 +238,7 @@ verbose_turn_on = Turn on
verbose_turn_off = Turn off verbose_turn_off = Turn off
resource_uri = Resource URI resource_uri = Resource URI
individual_not_found = Individual not found: individual_not_found = Individual Not Found
entity_to_query_for = This id is the id of the entity to query for. netid also works.
menu_ordering = Menu Ordering menu_ordering = Menu Ordering
refresh_page_after_reordering = Refresh page after reordering menu items 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_was_reported = This error has been reported to the site administrator.
error_message = Error message error_message = Error message
stack_trace = Stack trace 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 caused_by = Caused by
requested_url = Requested url requested_url = Requested url
error_occurred = An error occurred on the VIVO site error_occurred = An error occurred on the {0} site
error_occurred_at = An error occurred on your VIVO site at {0}. error_occurred_at = An error occurred on your {0} site at {1}.
# #
# login templates ( /templates/freemarker/body/login ) # login templates ( /templates/freemarker/body/login )
@ -426,7 +425,7 @@ undo_camelcasing = Uncamelcasing
run_sdb_setup = Run SDB Setup run_sdb_setup = Run SDB Setup
unrecognized_user = Unrecognized user 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 ) # 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. operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
relate_editors_profiles = Relate profile editors and profiles relate_editors_profiles = Relate profile editors and profiles
info_icon = info icon 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_editors = Select editors
select_last_name = Select an existing last name select_last_name = Select an existing last name
processing_indicator = processing time indicator processing_indicator = processing time indicator

2
webapp/web/templates/freemarker/body/about.ftl
View file

@ -2,7 +2,7 @@
<#-- Template for the body of the About page --> <#-- Template for the body of the About page -->
<h2>${title}</h2> <h2>${siteName!}</h2>
<#if aboutText?has_content> <#if aboutText?has_content>
<div class="pageGroupBody" id="aboutText">${aboutText}</div> <div class="pageGroupBody" id="aboutText">${aboutText}</div>

2
webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
View file

@ -2,7 +2,7 @@
<#-- Contact form processing errors --> <#-- Contact form processing errors -->
<h2>${title}</h2> <h2>${title!}</h2>
<#if errorMessage?has_content> <#if errorMessage?has_content>
<section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/> <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>

2
webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
View file

@ -3,7 +3,7 @@
<#-- Contact form --> <#-- Contact form -->
<section class="staticPageBackground feedbackForm" role="region"> <section class="staticPageBackground feedbackForm" role="region">
<h2>${title}</h2> <h2>${title!}</h2>
<#if errorMessage?has_content> <#if errorMessage?has_content>
<section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/> <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>

2
webapp/web/templates/freemarker/body/error/error-display.ftl
View file

@ -15,7 +15,7 @@
</#if> </#if>
<#if adminErrorData.stackTrace?has_content> <#if adminErrorData.stackTrace?has_content>
<p> <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> </p>
<#if adminErrorData.cause?has_content> <#if adminErrorData.cause?has_content>

10
webapp/web/templates/freemarker/body/error/error-email.ftl
View file

@ -2,7 +2,7 @@
<#-- Template for email message sent to site administrator when an error occurs on the site. --> <#-- 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")> <#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
@ -13,7 +13,7 @@
</head> </head>
<body> <body>
<p> <p>
${i18n().error_occurred_at(datetime!)} ${i18n().error_occurred_at(siteName!,datetime!)}
</p> </p>
<p> <p>
@ -27,7 +27,7 @@
</p> </p>
<p> <p>
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}):
<pre>${stackTrace!}</pre> <pre>${stackTrace!}</pre>
</p> </p>
@ -42,7 +42,7 @@
</#assign> </#assign>
<#assign text> <#assign text>
${i18n().error_occurred_at(datetime!)} ${i18n().error_occurred_at(siteName!,datetime!)}
${i18n().requested_url}: ${requestedUrl!} ${i18n().requested_url}: ${requestedUrl!}
@ -50,7 +50,7 @@ ${i18n().requested_url}: ${requestedUrl!}
${i18n().error_message}: ${errorMessage!} ${i18n().error_message}: ${errorMessage!}
</#if> </#if>
${i18n().stack_trace} (${i18n().trace_available}): ${i18n().stack_trace} (${i18n().trace_available(siteName!)}):
${stackTrace!} ${stackTrace!}
<#if cause?has_content> <#if cause?has_content>

2
webapp/web/templates/freemarker/body/error/error-titled.ftl
View file

@ -2,6 +2,6 @@
<#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. --> <#-- 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"> <#include "error-message.ftl">

1
webapp/web/templates/freemarker/body/individual/individual-help.ftl
View file

@ -4,4 +4,3 @@
<h2>${i18n().individual_not_found}</h2> <h2>${i18n().individual_not_found}</h2>
<p>${i18n().entity_to_query_for}</p>

2
webapp/web/templates/freemarker/body/individualList.ftl
View file

@ -9,7 +9,7 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
<section class="individualList"> <section class="individualList">
<h2>${title} <h2>${title!}
<#if rdfUrl?has_content> <#if rdfUrl?has_content>
<span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span> <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
</#if> </#if>

2
webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
View file

@ -22,7 +22,7 @@
</section> </section>
<section class="proxy-profile"> <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"> <form id="add-relation" action="${formUrls.create}" method="POST">
<fieldset class="proxy"> <fieldset class="proxy">

2
webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
View file

@ -9,7 +9,7 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
<section class="individualList"> <section class="individualList">
<h2>${title} <h2>${title!}
</h2> </h2>
<#if subtitle?has_content> <#if subtitle?has_content>
<h4>${subtitle}</h4> <h4>${subtitle}</h4>

2
webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
View file

@ -41,7 +41,7 @@ variableName is used below.-->
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
<section class="individualList"> <section class="individualList">
<h2>${title} <h2>${title!}
</h2> </h2>
<#if subtitle?has_content> <#if subtitle?has_content>
<h4>${subtitle}</h4> <h4>${subtitle}</h4>

2
webapp/web/templates/freemarker/body/message/message-titled.ftl
View file

@ -2,6 +2,6 @@
<#-- Standard template to display a message with a title generated from any controller. Keeps this out of individual templates. --> <#-- 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"> <#include "message.ftl">

2
webapp/web/templates/freemarker/body/partials/dump/dump.ftl
View file

@ -5,7 +5,7 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')}
<div class="dump"> <div class="dump">
<h3>${title}</h3> <h3>${title!}</h3>
<#-- dump has been changed to dumpValue to avoid confusion <#-- dump has been changed to dumpValue to avoid confusion
with the dump directive which is stored in the DataModel as 'dump' --> with the dump directive which is stored in the DataModel as 'dump' -->

6
webapp/web/templates/freemarker/body/samples.ftl
View file

@ -5,7 +5,7 @@
<#import "lib-datetime.ftl" as dt> <#import "lib-datetime.ftl" as dt>
<#import "lib-string.ftl" as str> <#import "lib-string.ftl" as str>
<h2>${title}</h2> <h2>${title!}</h2>
<@widget name="test" /> <@widget name="test" />
@ -57,8 +57,8 @@
<p>${year?number?c}</p> <p>${year?number?c}</p>
<h3>${i18n().raw_string_literals}</h3> <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> <h2>${i18n().containers_do_not_pick_up_changes}</h2>
<#assign <#assign

2
webapp/web/templates/freemarker/body/test.ftl
View file

@ -2,4 +2,4 @@
<#-- FreeMarker test cases --> <#-- FreeMarker test cases -->
<h2>${title}</h2> <h2>${title!}</h2>

2
webapp/web/templates/freemarker/body/unrecognizedUser.ftl
View file

@ -6,7 +6,7 @@
<h2>${i18n().unrecognized_user}</h2> <h2>${i18n().unrecognized_user}</h2>
<p> <p>
${i18n().no_individual_associated_with_id} ${i18n().no_individual_associated_with_id(siteName!)}
</p> </p>
<br/> <br/>

2
webapp/web/templates/freemarker/page/partials/title.ftl
View file

@ -1,3 +1,3 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<title>${title}</title> <title>${siteName!}</title>