[Yanel-commits] rev 48952 -
public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform
michi at wyona.com
michi at wyona.com
Wed Apr 21 14:27:26 CEST 2010
Author: michi
Date: 2010-04-21 14:27:26 +0200 (Wed, 21 Apr 2010)
New Revision: 48952
Modified:
public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
Log:
bug re language fixed
Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java 2010-04-21 12:22:19 UTC (rev 48951)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java 2010-04-21 12:27:26 UTC (rev 48952)
@@ -76,7 +76,6 @@
private String messageBundle = "contact-form";
private Path path = null;
- private String language = null;
private String defaultEmailRegEx = "(\\w+)@(\\w+\\.)(\\w+)(\\.\\w+)*";
@@ -93,16 +92,7 @@
*/
public View getView(HttpServletRequest request, String viewId) throws Exception {
path = new Path(request.getServletPath());
- try {
- language = request.getParameter("yanel.meta.language");
- } catch(Exception e) {
- log.debug("language param is not found will use default : " + language);
- language = defaultLanguage;
- }
- if(language == null || ("").equals(language)) {
- log.debug("language param is empty or null : " + language);
- language = defaultLanguage;
- }
+
File xmlFile = org.wyona.commons.io.FileUtil.file(rtd.getConfigFile().getParentFile().getAbsolutePath(), "xml" + File.separator + "contact-form.xml");
// create reader:
@@ -152,7 +142,9 @@
messageBundles[0] = messageBundle;
messageBundles[1] = "global";
- I18nTransformer2 i18nTransformer = new I18nTransformer2(messageBundles, language, getRealm().getDefaultLanguage());
+ log.debug("Language: " + getRequestedLanguage());
+ log.debug("Realm default language: " + getRealm().getDefaultLanguage());
+ I18nTransformer2 i18nTransformer = new I18nTransformer2(messageBundles, getRequestedLanguage(), getRealm().getDefaultLanguage());
i18nTransformer.setEntityResolver(catalogResolver);
// create serializer:
More information about the Yanel-commits
mailing list