kpiroumian 02/04/25 09:24:37
Modified: src/java/org/apache/cocoon/transformation
I18nTransformer.java
Log:
Removed dependency on LocaleAction.
Locale is now set from the as a sitemap parameter.
Revision Changes Path
1.15 +9 -3
xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- I18nTransformer.java 20 Apr 2002 09:37:06 -0000 1.14
+++ I18nTransformer.java 25 Apr 2002 16:24:37 -0000 1.15
@@ -83,7 +83,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.acting.LocaleAction;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.i18n.I18nUtils;
@@ -225,7 +224,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Michael Enke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Lassi Immonen</a>
- * @version CVS $Id: I18nTransformer.java,v 1.14 2002/04/20 09:37:06 froehlich Exp $
+ * @version CVS $Id: I18nTransformer.java,v 1.15 2002/04/25 16:24:37 kpiroumian Exp
$
*
* @todo Move all formatting/parsing routines to I18nUtils
*/
@@ -516,6 +515,12 @@
// Configuration parameters
/**
+ * This configuration parameter specifies the default locale to be used.
+ */
+ public static final String I18N_LOCALE = "locale";
+
+
+ /**
* This configuration parameter specifies the message catalog name.
*/
public static final String I18N_CATALOGUE_NAME = "catalogue-name";
@@ -739,6 +744,7 @@
String localCatLocation = null;
String localCatName = null;
String localUntranslated = null;
+ String lc = null;
if (parameters != null) {
localCatLocation =
@@ -747,6 +753,7 @@
parameters.getParameter(I18N_CATALOGUE_NAME, null);
localUntranslated =
parameters.getParameter(I18N_UNTRANSLATED, null);
+ lc = parameters.getParameter(I18N_LOCALE, null);
}
// if untranslated-text has been overridden, save the original
@@ -762,7 +769,6 @@
: localCatLocation);
// Get current locale
- String lc = LocaleAction.getLocaleAttribute(objectModel);
Locale locale = I18nUtils.parseLocale(lc);
debug("using locale " + locale.toString());
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
