This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 50c50d5adc9a712d3fb97a987fddc886d2c21f06 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Fri Nov 13 19:37:55 2015 +0100 Add dev mode case for i18n init --- .../main/java/org/chorem/pollen/ui/PollenApplicationListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java index b3a69c0..fef2060 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java @@ -40,6 +40,7 @@ import org.chorem.pollen.services.PollenServiceFactory; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.votecounting.VoteCountingFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; @@ -94,7 +95,12 @@ public class PollenApplicationListener implements ServletContextListener { DefaultI18nInitializer i18nInitializer = new DefaultI18nInitializer("pollen-i18n"); i18nInitializer.setMissingKeyReturnNull(true); - I18n.init(i18nInitializer, Locale.getDefault()); + try { + I18n.init(i18nInitializer, Locale.getDefault()); + } catch (Exception e) { + // dev mode case + I18n.init(new ClassPathI18nInitializer(), Locale.getDefault()); + } PollenApplicationContext applicationContext = new PollenApplicationContext(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.