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

template changes for internationalization -- replaced displayed text with calls to properties file containing actual strings

Browse source
This commit is contained in:
tworrall 2013-05-13 12:17:39 -04:00
parent 6d7f8e05c8
commit fa68e0c057
24 changed files with 407 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl
View file

@ -4,26 +4,26 @@
<h2>Restrict Logins</h2>
<#if messageAlreadyRestricted??>
<#assign errorMessage = "Logins are already restricted." />
<#assign errorMessage = "${i18n().logins_already_restricted}" />
</#if>
<#if messageAlreadyOpen??>
<#assign errorMessage = "Logins are already not restricted." />
<#assign errorMessage = "${i18n().logins_not_already_restricted}" />
</#if>
<#if errorMessage?has_content>
<section id="error-alert" role="alert">
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
<p>${errorMessage}</p>
</section>
</#if>
<#if messageRestricting??>
<#assign successMessage = "Logins are now restricted." />
<#assign successMessage = "${i18n().logins_restricted}" />
</#if>
<#if messageOpening??>
<#assign successMessage = "Logins are no longer restricted." />
<#assign successMessage = "${i18n().logins_not_restricted}" />
</#if>
<#if successMessage?has_content>
@ -36,9 +36,9 @@
<section id="restrict-login" role="region">
<#if restricted == true>
<h4>Logins are restricted</h4>
<p><a href="${openUrl}" title="Remove Restrictions">Remove Restrictions</a></p>
<p><a href="${openUrl}" title="${i18n().remove_restrictions}">${i18n().remove_restrictions}</a></p>
<#else>
<h4>Logins are open to all</h4>
<p><a href="${restrictUrl}" title="Restrict Logins">Restrict Logins</a></p>
<p><a href="${restrictUrl}" title="${i18n().Restrict Logins}">${i18n().Restrict Logins}</a></p>
</#if>
</section>

36
webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
View file

@ -7,24 +7,24 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
<h2>Authorization Info</h2>
<section id="show-auth" role="region">
<h4>Current user</h4>
<h4>${i18n().current_user}</h4>
<table summary="Information about the current user">
<#if currentUser?has_content>
<tr><th>URI:</th><td>${currentUser.uri}</td></tr>
<tr><th>First name:</th><td>${currentUser.firstName}</td></tr>
<tr><th>Last name:</th><td>${currentUser.lastName}</td></tr>
<tr><th>Email:</th><td>${currentUser.emailAddress}</td></tr>
<tr><th>External Auth ID:</th><td>${currentUser.externalAuthId}</td></tr>
<tr><th>Login count:</th><td>${currentUser.loginCount}</td></tr>
<tr><th>${i18n().first_name}:</th><td>${currentUser.firstName}</td></tr>
<tr><th>${i18n().last_name}:</th><td>${currentUser.lastName}</td></tr>
<tr><th>${i18n().email_Address}:</th><td>${currentUser.emailAddress}</td></tr>
<tr><th>${i18n().external_auth_id}:</th><td>${currentUser.externalAuthId}</td></tr>
<tr><th>${i18n().login_count}:</th><td>${currentUser.loginCount}</td></tr>
<#list currentUser.permissionSetUris as role>
<tr><th>Role:</th><td>${role}</td></tr>
<tr><th>${i18n().role}:</th><td>${role}</td></tr>
</#list>
<#else>
<tr><th>Not logged in</th></tr>
<tr><th>${i18n().not_logged_in}</th></tr>
</#if>
</table>
<h4>Identifiers:</h4>
<h4>${i18n().identifiers}:</h4>
<table summary="Identifiers">
<#list identifiers as identifier>
<tr>
@ -34,11 +34,11 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
</table>
<h4>
AssociatedIndividuals:
${i18n().associated_individuals}:
<#if matchingProperty??>
(match by ${matchingProperty})
(${i18n().match_by(matchingProperty)})
<#else>
(matching property is not defined)
(${i18n().matching_prop_not_defined})
</#if>
</h4>
<table summary="Associated Individuals">
@ -47,18 +47,18 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
<tr>
<td>${associatedIndividual.uri}</td>
<#if associatedIndividual.editable>
<td>May edit</td>
<td>${i18n().may_edit}</td>
<#else>
<td>May not edit</td>
<td>${i18n().may_not_edit}</td>
</#if>
</tr>
</#list>
<#else>
<tr><td>none</td></tr>
<tr><td>${i18n().none}</td></tr>
</#if>
</table>
<h4>Identifier factories:</h4>
<h4>${i18n().identifier_factories}:</h4>
<table summary="Active Identifier Factories">
<#list factories as factory>
<tr>
@ -67,7 +67,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
</#list>
</table>
<h4>Policies:</h4>
<h4>${i18n().policies}:</h4>
<table summary="Policies" width="100%">
<#list policies as policy>
<tr>
@ -76,7 +76,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
</#list>
</table>
<h4>Authenticator:</h4>
<h4>${i18n().authenticator}:</h4>
<table summary="Authenticator" width="100%">
<tr>
<td>${authenticator}</td>

10
webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
View file

@ -17,15 +17,15 @@ table.threadInfo th {
</style>
<h2>Background Threads</h2>
<h2>${i18n().background_threads}</h2>
<section id="show-threads" role="region">
<#list threads as threadInfo>
<table class="threadInfo ${threadInfo.workLevel}" summary="Thread ${threadInfo.name}">
<tr><th>Name</th><td>${threadInfo.name}</td></tr>
<tr><th>WorkLevel</th><td>${threadInfo.workLevel}</td></tr>
<tr><th>Since</th><td>${threadInfo.since}</td></tr>
<tr><th>Flags</th><td>${threadInfo.flags}</td></tr>
<tr><th>${i18n().name}</th><td>${threadInfo.name}</td></tr>
<tr><th>${i18n().work_level}</th><td>${threadInfo.workLevel}</td></tr>
<tr><th>${i18n().since}</th><td>${threadInfo.since}</td></tr>
<tr><th>${i18n().flags}</th><td>${threadInfo.flags}</td></tr>
</table>
</#list>
</section>

26
webapp/web/templates/freemarker/body/admin/searchIndex.ftl
View file

@ -4,40 +4,40 @@
Template for the page that controls the updating or rebuilding of the Search Index.
-->
<h2>Search Index Status</h2>
<h2>${i18n().search_index_status}</h2>
<#if !indexIsConnected>
<!-- Can't contact the Solr server. Indexing would be impossible. Show an error message. -->
<section id="error-alert" role="alert">
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
<p>The search index is not connected.</p>
<p><tt>SolrServer.ping()</tt> failed.
<p>Check startup status page and/or Tomcat logs for more information.</p>
<p>${i18n().search_index_not_connected}</p>
<p><tt>SolrServer.ping()</tt> ${i18n().failed}.
<p>${i18n().check_startup_status}</p>
</section>
<#elseif worklevel == "IDLE">
<!-- Solr indexer is idle. Show the button that rebuilds the index. -->
<h3>The search indexer is idle.</h3>
<h3>${i18n().search_indexer_idle}</h3>
<#if hasPreviousBuild??>
<p>The most recent update was at ${since?string("hh:mm:ss a, MMMM dd, yyyy")}</p>
<p>${i18n().most_recent_update} ${since?string("hh:mm:ss a, MMMM dd, yyyy")}</p>
</#if>
<form action="${actionUrl}" method="POST">
<p>
<input class="submit" type="submit" name="rebuild" value="Rebuild" role="button" />
Reset the search index and re-populate it.
<input class="submit" type="submit" name="rebuild" value="${i18n().rebuild_button}" role="button" />
${i18n().reset_search_index}
</p>
</form>
<#elseif totalToDo == 0>
<!-- Solr indexer is preparing the list of records. Show elapsed time since request. -->
<h3>Preparing to rebuild the search index. </h3>
<p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}</p>
<h3>${i18n().preparing_to_rebuild_index}</h3>
<p>${i18n().since_elapsed_time(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed)}</p>
<#else>
<!-- Solr indexer is re-building the index. Show the progress. -->
<h3>${currentTask} the search index.</h3>
<p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}, estimated total time ${expected}</p>
<p>Completed ${completedCount} out of ${totalToDo} index records.</p>
<h3>${i18n().current_task(currentTask)}</h3>
<p>${i18n().since_elapsed_time_est_total(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed,expected)}</p>
<p>${i18n().index_recs_completed(completedCount,totalToDo)}</p>
</#if>

12
webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
View file

@ -35,9 +35,9 @@
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')}
<#if status.errorItems?has_content>
<h2>Fatal error</h2>
<h2>${i18n().fatal_error}</h2>
<p>${applicationName} detected a fatal error during startup.</p>
<p>${i18n().fatal_error_detected(applicationName)}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.errorItems as item>
@ -47,9 +47,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
</#if>
<#if status.warningItems?has_content>
<h2>Warning</h2>
<h2>${i18n().warning}</h2>
<p>${applicationName} issued warnings during startup.</p>
<p>${i18n().warning_issued(applicationName)}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
<@statusItem item=item />
@ -57,9 +57,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
</ul>
</#if>
<h2>Startup trace</h2>
<h2>${i18n().startup_trace}</h2>
<p>The full list of startup events and messages.</p>
<p>${i18n().full_list_startup}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.statusItems as item>

16
webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
View file

@ -40,7 +40,7 @@
<html lang="en">
<head>
<title>Startup Status</title>
<title>${i18n().startup_status}</title>
<style TYPE="text/css">
#startup-trace {
@ -77,9 +77,9 @@
<body>
<#if status.errorItems?has_content>
<h2>Fatal error</h2>
<h2>${i18n().fatal_error}</h2>
<p>${applicationName} detected a fatal error during startup.</p>
<p>${i18n().fatal_error_detected(applicationName)}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.errorItems as item>
@ -89,9 +89,9 @@
</#if>
<#if status.warningItems?has_content>
<h2>Warning</h2>
<h2>${i18n().warning}</h2>
<p>${applicationName} issued warnings during startup.</p>
<p>${i18n().warning_issued(applicationName)}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
<@statusItem item=item />
@ -100,14 +100,14 @@
<#-- If there were no fatal errors, let them go forward from here. -->
<#if showLink>
<p><a href="${url}" title="continue">Continue</a></p>
<p><a href="${url}" title="continue">${i18n().continue}</a></p>
</#if>
</#if>
<h2>Startup trace</h2>
<h2>${i18n().startup_trace}</h2>
<p>The full list of startup events and messages.</p>
<p>${i18n().full_list_startup}</p>
<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
<#list status.statusItems as item>