AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow a default locale to be specified for a message manager.

Browse Source 
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1672 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2005-07-06 22:52:36 +00:00
parent c0a0a5de9e
commit 7afde07fb6
2 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/src/java/com/samskivert/servlet/MessageManager.java
+45 -34
View File
@@ -46,10 +46,11 @@ public class MessageManager
*
* @see java.util.ResourceBundle
*/
public MessageManager (String bundlePath)
public MessageManager (String bundlePath, Locale deflocale)
{
// keep this for later
// keep these for later
_bundlePath = bundlePath;
_deflocale = deflocale;
}
/**
@@ -169,7 +170,7 @@ public class MessageManager
if (reportMissing) {
// if there's no translation for this path, complain about it
Log.warning("Missing translation message [path=" + path +
", url=" + req.getRequestURL() + "].");
", url=" + getURL(req) + "].");
return path;
}
@@ -184,8 +185,10 @@ public class MessageManager
{
// first look to see if we've cached the bundles for this request
// in the request object
ResourceBundle[] bundles = (ResourceBundle[])
req.getAttribute(BUNDLE_CACHE_NAME);
ResourceBundle[] bundles = null;
if (req != null) {
bundles = (ResourceBundle[])req.getAttribute(BUNDLE_CACHE_NAME);
}
if (bundles != null) {
return bundles;
}
@@ -216,7 +219,7 @@ public class MessageManager
getClass().getClassLoader());
// if we found either or both bundles, cache 'em
if (bundles[0] != null || bundles[1] != null) {
if (bundles[0] != null || bundles[1] != null && req != null) {
req.setAttribute(BUNDLE_CACHE_NAME, bundles);
}
@@ -231,31 +234,33 @@ public class MessageManager
HttpServletRequest req, String bundlePath, ClassLoader loader)
{
ResourceBundle bundle = null;
Enumeration locales = req.getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale)locales.nextElement();
if (req != null) {
Enumeration locales = req.getLocales();
while (locales.hasMoreElements()) {
Locale locale = (Locale)locales.nextElement();
try {
// java caches resource bundles, so we don't need to
// reinvent the wheel here. however, java also falls back
// from a specific bundle to a more general one if it
// can't find a specific bundle. that's real nice of it,
// but we want first to see whether or not we have exact
// matches on any of the preferred locales specified by
// the client. if we don't, then we can rely on java's
// fallback mechanisms
bundle = ResourceBundle.getBundle(
bundlePath, locale, loader);
try {
// java caches resource bundles, so we don't need to
// reinvent the wheel here. however, java also falls back
// from a specific bundle to a more general one if it
// can't find a specific bundle. that's real nice of it,
// but we want first to see whether or not we have exact
// matches on any of the preferred locales specified by
// the client. if we don't, then we can rely on java's
// fallback mechanisms
bundle = ResourceBundle.getBundle(
bundlePath, locale, loader);
// if it's an exact match, off we go
if (bundle.getLocale().equals(locale)) {
break;
// if it's an exact match, off we go
if (bundle.getLocale().equals(locale)) {
break;
}
} catch (MissingResourceException mre) {
// no need to freak out quite yet, see if we have
// something for one of the other preferred locales
}
} catch (MissingResourceException mre) {
// no need to freak out quite yet, see if we have
// something for one of the other preferred locales
}
}
@@ -263,27 +268,30 @@ public class MessageManager
// preferred locales, take their most preferred and let java
// perform it's fallback logic on that one
if (bundle == null) {
Locale locale = (req == null) ? _deflocale : req.getLocale();
try {
bundle = ResourceBundle.getBundle(
bundlePath, req.getLocale(), loader);
bundle = ResourceBundle.getBundle(bundlePath, locale, loader);
} catch (MissingResourceException mre) {
// if we were unable even to find a default bundle, we've
// got real problems. time to freak out
Log.warning("Unable to resolve any message bundle " +
"[req=" + req.getRequestURI() +
", locale=" + req.getLocale() +
"[req=" + getURL(req) + ", locale=" + locale +
", bundlePath=" + bundlePath +
", classLoader=" + loader +
", siteBundlePath=" + _siteBundlePath +
", siteLoader=" + _siteLoader +
"].");
", siteLoader=" + _siteLoader + "].");
}
}
return bundle;
}
/** Helper function. */
protected String getURL (HttpServletRequest req)
{
return (req == null) ? "<none>" : req.getRequestURL().toString();
}
/** The path, relative to the classpath, to our resource bundles. */
protected String _bundlePath;
@@ -299,6 +307,9 @@ public class MessageManager
* request was made. */
protected SiteIdentifier _siteIdent;
/** The locale to use if we are accessed without an HTTP request. */
protected Locale _deflocale;
/** The attribute name that we use for caching resource bundles in
* request objects. */
protected static final String BUNDLE_CACHE_NAME =
projects/samskivert/src/java/com/samskivert/velocity/Application.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class Application
// instantiate our message manager if the application wants one
String bundlePath = getInitParameter(config, MESSAGE_BUNDLE_PATH_KEY);
if (!StringUtil.blank(bundlePath)) {
_msgmgr = new MessageManager(bundlePath);
_msgmgr = new MessageManager(bundlePath, null);
}
// if we have a site-specific resource loader, configure the