kpiroumian 2002/11/27 02:51:29
Modified: src/java/org/apache/cocoon/transformation Tag:
cocoon_2_0_3_branch I18nTransformer.java
Log:
Allow to set locale from the sitemap as a parameter (ported from 2.1-dev)
Revision Changes Path
No revision
No revision
1.13.2.6 +12 -2
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.13.2.5
retrieving revision 1.13.2.6
diff -u -r1.13.2.5 -r1.13.2.6
--- I18nTransformer.java 11 Sep 2002 15:23:26 -0000 1.13.2.5
+++ I18nTransformer.java 27 Nov 2002 10:51:29 -0000 1.13.2.6
@@ -516,6 +516,12 @@
// Configuration parameters
/**
+ * This configuration parameter specifies the default locale to be used.
+ * @since 2.0.4
+ */
+ 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 +745,7 @@
String localCatLocation = null;
String localCatName = null;
String localUntranslated = null;
+ String lc = null;
if (parameters != null) {
localCatLocation =
@@ -747,6 +754,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 +770,9 @@
: localCatLocation);
// Get current locale
- String lc = LocaleAction.getLocaleAttribute(objectModel);
+ if (lc == null) {
+ 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]
