From d3f6af6981320850b91f77871df11b94b07b4bf7 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 14 Nov 2013 17:05:04 -0500 Subject: [PATCH] VIVO-523 Change the way the example language files are presented. --- .../i18n/all_es.properties => es_GO/i18n/all_es_GO.properties} | 0 .../templates/freemarker/search-help_es_GO.ftl} | 0 .../templates/freemarker/termsOfUse_es_GO.ftl} | 0 .../freemarker/userAccounts-acctCreatedEmail_es_GO.ftl} | 0 .../userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl} | 0 .../userAccounts-confirmEmailChangedEmail_es_GO.ftl} | 0 .../freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl} | 0 .../freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl} | 0 .../userAccounts-passwordResetCompleteEmail_es_GO.ftl} | 0 .../userAccounts-passwordResetPendingEmail_es_GO.ftl} | 0 .../vitro/webapp/i18n/selection/LocaleSelectionSetup.java | 3 ++- 11 files changed, 2 insertions(+), 1 deletion(-) rename webapp/languages/{example/i18n/all_es.properties => es_GO/i18n/all_es_GO.properties} (100%) rename webapp/languages/{example/templates/freemarker/search-help_es.ftl => es_GO/templates/freemarker/search-help_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/termsOfUse_es.ftl => es_GO/templates/freemarker/termsOfUse_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-acctCreatedEmail.ftl => es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl => es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl => es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl => es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl} (100%) rename webapp/languages/{example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl => es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl} (100%) diff --git a/webapp/languages/example/i18n/all_es.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties similarity index 100% rename from webapp/languages/example/i18n/all_es.properties rename to webapp/languages/es_GO/i18n/all_es_GO.properties diff --git a/webapp/languages/example/templates/freemarker/search-help_es.ftl b/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/search-help_es.ftl rename to webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/termsOfUse_es.ftl b/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/termsOfUse_es.ftl rename to webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-confirmEmailChangedEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-confirmEmailChangedEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-firstTimeExternalEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-firstTimeExternalEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-passwordCreatedEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetCompleteEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl diff --git a/webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl b/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl similarity index 100% rename from webapp/languages/example/templates/freemarker/userAccounts-passwordResetPendingEmail.ftl rename to webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java index c89819421..081019a04 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java @@ -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;