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

VIVO-139 Use the I18n framework wherever DisplayMessage is loaded.

Browse source
This commit is contained in:
j2blake 2013-06-14 12:47:37 -04:00
parent aa7c8024d0
commit 5de5a322a2
19 changed files with 151 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
View file

@ -62,7 +62,7 @@
<section id="passwordContainer" role="region">
<label for="initial-password">${strings.initial_password}<span class="requiredHint"> *</span></label>
<input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
<p class="note">${strings.minimum_password_length}</p>
<p class="note">${strings.minimum_password_length(minimumLength)}</p>
<label for="confirm-password">${strings.confirm_initial_password}<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />

2
webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
View file

@ -47,7 +47,7 @@
<p><input type="submit" name="submit" value="${strings.create_account}" class="submit"/>
${strings.or}
<a class="cancel" href="${urls.home}" title="${string.cancel_title}">${strings.cancel_link}</a>
<a class="cancel" href="${urls.home}" title="${strings.cancel_title}">${strings.cancel_link}</a>
</p>
<p class="requiredHint">* ${strings.required_fields}</p>

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

@ -2,7 +2,7 @@
<#-- Template for restricting (or opening) access to logins. -->
<h2>Restrict Logins</h2>
<h2>${i18n().restrict_logins}</h2>
<#if messageAlreadyRestricted??>
<#assign errorMessage = "${i18n().logins_already_restricted}" />
</#if>
@ -35,10 +35,10 @@
<section id="restrict-login" role="region">
<#if restricted == true>
<h4>Logins are restricted</h4>
<h4>${i18n().logins_are_restricted}</h4>
<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="${i18n().Restrict Logins}">${i18n().Restrict Logins}</a></p>
<h4>${i18n().logins_are_open}</h4>
<p><a href="${restrictUrl}" title="${i18n().restrict_logins}">${i18n().restrict_logins}</a></p>
</#if>
</section>

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

@ -22,7 +22,7 @@
</#if>
<#if errorNewPasswordWrongLength??>
<#assign errorMessage = "${i18n().password_length}" />
<#assign errorMessage = "${i18n().password_length(minPasswordLength, maxPasswordLength)}" />
</#if>
<#if errorNewPasswordsDontMatch??>
@ -51,7 +51,7 @@
<label for="newPassword">${i18n().new_password}</label>
<input name="newPassword" id="newPassword" class="text-field" type="password" required autofocus />
<p class="password-note">${i18n().Minimum of 6 characters in length.</p>
<p class="password-note">${i18n().minimum_password_length(minPasswordLength)}</p>
<label for="confirmPassword">${i18n().confirm_password}</label>
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />

2
webapp/web/templates/freemarker/widgets/widget-login.ftl
View file

@ -90,7 +90,7 @@
<label for="newPassword">${i18n().new_password_capitalized}</label>
<input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
<p class="password-note">${i18n().minimum_six_chars}</p>
<p class="password-note">${i18n().minimum_password_length(minimumPasswordLength)}</p>
<label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
<input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />