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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
j2blake 2013-11-14 17:06:09 -05:00
commit c8b3238e71
11 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
webapp/languages/example/i18n/all_es.properties → webapp/languages/es_GO/i18n/all_es_GO.properties
View file

0
webapp/languages/example/templates/freemarker/search-help_es.ftl → webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/termsOfUse_es.ftl → webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
View file

0
webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl → webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
View file

3
webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
View file

@ -134,7 +134,8 @@ public class LocaleSelectionSetup implements ServletContextListener {
throws IllegalArgumentException {
Locale locale = LocaleUtils.toLocale(localeString);
if (!LocaleUtils.isAvailableLocale(locale)) {
if (!"es_GO".equals(localeString) && // No complaint about bogus locale
!LocaleUtils.isAvailableLocale(locale)) {
ssWarning("'" + locale + "' is not a recognized locale.");
}
return locale;