jvanzyl 01/06/14 07:40:38
Modified: src/java/org/apache/turbine/services/localization
TurbineLocalizationService.java
Log:
- updating service as per notes.
Revision Changes Path
1.8 +22 -15
jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineLocalizationService.java 2001/05/20 00:49:07 1.7
+++ TurbineLocalizationService.java 2001/06/14 14:40:38 1.8
@@ -57,9 +57,8 @@
import java.util.Hashtable;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
/**
@@ -93,10 +92,10 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jonas Maurus</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @version $Id: TurbineLocalizationService.java,v 1.7 2001/05/20 00:49:07 jon Exp $
+ * @version $Id: TurbineLocalizationService.java,v 1.8 2001/06/14 14:40:38 jvanzyl
Exp $
*/
public class TurbineLocalizationService
- extends TurbineBaseService
+ extends BaseService
implements LocalizationService
{
/**
@@ -123,7 +122,7 @@
throws InitializationException
{
bundles = new Hashtable();
- defaultBundle = TurbineResources.getString("locale.default.bundle");
+ defaultBundle = getConfiguration().getString("locale.default.bundle");
setInit(true);
}
@@ -148,13 +147,13 @@
*/
public ResourceBundle getBundle(String bundleName)
{
- String language =
- TurbineResources.getString("locale.default.language", "en").trim();
- String country =
- TurbineResources.getString("locale.default.country", "US").trim();
+ String language = getConfiguration().getString(
+ "locale.default.language", "en").trim();
+
+ String country = getConfiguration().getString(
+ "locale.default.country", "US").trim();
- return getBundle( bundleName,
- new Locale(language, country) );
+ return getBundle( bundleName, new Locale(language, country) );
}
/**
@@ -184,8 +183,12 @@
public ResourceBundle getBundle(RunData data)
{
Locale locale = LocaleDetector.getLocale(data);
+
if (locale == null)
+ {
return getBundle();
+ }
+
return getBundle( defaultBundle, locale );
}
@@ -202,8 +205,12 @@
RunData data)
{
Locale locale = LocaleDetector.getLocale(data);
+
if (locale == null)
+ {
return getBundle(bundleName);
+ }
+
return getBundle( bundleName, locale );
}
@@ -231,8 +238,8 @@
else
{
// Try to create a ResourceBundle for this Locale.
- ResourceBundle rb = ResourceBundle.getBundle(bundleName,
- locale);
+ ResourceBundle rb =
+ ResourceBundle.getBundle(bundleName, locale);
// Cache the ResourceBundle in memory.
locales.put( rb.getLocale(), rb );
@@ -243,8 +250,8 @@
else
{
// Try to create a ResourceBundle for this Locale.
- ResourceBundle rb = ResourceBundle.getBundle(bundleName,
- locale);
+ ResourceBundle rb =
+ ResourceBundle.getBundle(bundleName,locale);
// Cache the ResourceBundle in memory.
Hashtable ht = new Hashtable();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
