[Yanel-commits] rev 24927 -
public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources
michi at wyona.com
michi at wyona.com
Tue Jun 5 17:16:44 CEST 2007
Author: michi
Date: 2007-06-05 17:16:43 +0200 (Tue, 05 Jun 2007)
New Revision: 24927
Modified:
public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
Log:
get language fixed
Modified: public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java 2007-06-05 14:59:20 UTC (rev 24926)
+++ public/yanel/trunk/src/contributions/resources/nutch/src/java/org/wyona/yanel/impl/resources/NutchResource.java 2007-06-05 15:16:43 UTC (rev 24927)
@@ -336,6 +336,7 @@
log.debug("Back 2 realm: " + PathUtil.backToRealm(getPath()));
transformer.transform(new javax.xml.transform.dom.DOMSource(document), new StreamResult(byteArrayOutputStream));
InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+ //log.error("DEBUG 1: " + getI18nResourceBundleName() + ", " + getLanguage() + ", " + getRealm().getDefaultLanguage());
I18nTransformer i18nTransformer = new I18nTransformer(getI18nResourceBundleName(), getLanguage(), getRealm().getDefaultLanguage());
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
saxParser.parse(inputStream, i18nTransformer);
@@ -386,6 +387,7 @@
xIncludeTransformer.setResolver(resolver);
// create i18n transformer:
+ //log.error("DEBUG 2: " + getI18nResourceBundleName() + ", " + getLanguage() + ", " + getRealm().getDefaultLanguage());
I18nTransformer2 i18nTransformer = new I18nTransformer2(getI18nResourceBundleName(), getLanguage(), getRealm().getDefaultLanguage());
i18nTransformer.setEntityResolver(catalogResolver);
@@ -725,28 +727,7 @@
* Get language
*/
private String getLanguage() throws Exception {
- String language = getResourceConfigProperty("language");
-
- if (language == null) {
- language = getRequest().getParameter("yanel.meta.language");
- }
-
- if (language == null) {
- language = getRequest().getHeader("Accept-Language");
- if (language != null) {
- log.debug("Use Accept-Language from Request Header: " + language);
- if (language.indexOf(",") > 0) {
- language = language.substring(0, language.indexOf(","));
- }
- }
- }
-
- if (language == null) {
- language = getRealm().getDefaultLanguage();
- }
-
- log.error("DEBUG: Language: " + language);
- return language;
+ return getRequestedLanguage();
}
/**
More information about the Yanel-commits
mailing list