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

more template updates for i18n

Browse source
This commit is contained in:
tworrall 2013-05-31 11:57:37 -04:00
parent 20e6db75cd
commit 4a01fa057b
8 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,7 +227,7 @@ group_name = group name
scroll_to_menus = scroll to property group menus
properties_capitalized = Properties
properties = properties
view_all = View All
view_all_capitalized = View All
name = name
@ -262,7 +262,8 @@ restrict_logins = Restrict Logins
error_alert_icon = Error alert icon
current_user = Current user
ext_auth_id = External Auth ID
external_auth_id = External Auth ID
user_role = Role
not_logged_in = Not logged in
identifiers = Identifiers
associated_individuals = Associated Individuals
@ -312,7 +313,7 @@ feedback_thanks_heading = Thank you for your feedback
feedback_thanks_text = Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.
return_to_the = Return to the
home_page = home page
from = From
from_capitalized = From
ip_address = IP address
viewing_page = Likely viewing page
comments = Comments
@ -738,3 +739,4 @@ vitro_bullet_three = Build a public web site to display your data
vitro_bullet_four = Search your data
search_vitro = Search VITRO
filter_search = filter search

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

@ -13,11 +13,11 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
<tr><th>URI:</th><td>${currentUser.uri}</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().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>${i18n().role}:</th><td>${role}</td></tr>
<tr><th>${i18n().user_role}:</th><td>${role}</td></tr>
</#list>
<#else>
<tr><th>${i18n().not_logged_in}</th></tr>

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

@ -12,7 +12,7 @@
<body>
<h3>${subject}</h3>
<p><strong>${i18n().from}:</strong> ${name}</p>
<p><strong>${i18n().from_capitalized}:</strong> ${name}</p>
<p><strong>${i18n().email_address}:</strong> ${emailAddress}</p>

2
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. -->
<#assign subject = i18n().error_occurred />
<#assign subject = "${i18n().error_occurred}" />
<#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>

14
webapp/web/templates/freemarker/body/login/adminLogin.ftl
View file

@ -6,31 +6,31 @@
<h2>${i18n().internal_login}</h2>
<#if errorNoEmail??>
<#assign errorMessage = i18n().no_email_supplied />
<#assign errorMessage = "${i18n().no_email_supplied}" />
</#if>
<#if errorNoPassword??>
<#assign errorMessage = i18n().no_password_supplied />
<#assign errorMessage = "${i18n().no_password_supplied}" />
</#if>
<#if errorLoginDisabled??>
<#assign errorMessage = i18n().logins_temporarily_disabled />
<#assign errorMessage = "${i18n().logins_temporarily_disabled}" />
</#if>
<#if errorLoginFailed??>
<#assign errorMessage = i18n().incorrect_email_password />
<#assign errorMessage = "${i18n().incorrect_email_password}" />
</#if>
<#if errorNewPasswordWrongLength??>
<#assign errorMessage = i18n().password_length />
<#assign errorMessage = "${i18n().password_length}" />
</#if>
<#if errorNewPasswordsDontMatch??>
<#assign errorMessage = i18n().password_mismatch />
<#assign errorMessage = "${i18n().password_mismatch}" />
</#if>
<#if errorNewPasswordMatchesOld??>
<#assign errorMessage = i18n().new_pwd_matches_existing />
<#assign errorMessage = "${i18n().new_pwd_matches_existing}" />
</#if>
<#if errorMessage?has_content>

2
webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
View file

@ -28,7 +28,7 @@
</#if>
</#list>
<#if (propertyGroups.all?size > 1) >
<li class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all}</li>
<li class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
<li class="groupTabSpacer">&nbsp;</li>
</#if>
</ul>

2
webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
View file

@ -39,7 +39,7 @@
</#if>
<#if editConfiguration.formTitle?contains("collaborator") >
<#assign formTitle = i18n().select_existing_collaborator(editConfiguration.subjectName) />
<#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" />
<#else>
<#assign formTitle = editConfiguration.formTitle />
</#if>

17
webapp/web/templates/freemarker/page/partials/languageSelector.ftl
View file

@ -7,15 +7,14 @@
-->
<#-- This is included by identity.ftl -->
<#if selectLocale??>
<li>
<#list selectLocale.locales as locale>
<a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale}">
<img src="${locale.imageUrl}" height="15" align="middle" alt="${locale.label}"/>
</a>
<#if locale_has_next>|</#if>
</#list>
</li>
<#if selectLocale??>
<#list selectLocale.locales as locale>
<li>
<a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale}">
<img src="${locale.imageUrl}" height="15" style="vertical-align:middle" alt="${locale.label}"/>
</a>
</li>
</#list>
</#if>
<#--