Author: jleroux
Date: Fri Dec 24 12:12:05 2010
New Revision: 1052494
URL: http://svn.apache.org/viewvc?rev=1052494&view=rev
Log:
Better solution for "Bug In Jquery Integration - js File Not Found"
(https://issues.apache.org/jira/browse/OFBIZ-4060) - OFBIZ-4060
A jquery.ui.datepicker i18n file is missing for the language.country couple you
want. Simply add it there: [" + baseLocation + "]. Else anyway the 'en' default
will be used", module)
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java?rev=1052494&r1=1052493&r2=1052494&view=diff
==============================================================================
---
ofbiz/trunk/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java
(original)
+++
ofbiz/trunk/framework/base/src/org/ofbiz/base/location/ComponentLocationResolver.java
Fri Dec 24 12:12:05 2010
@@ -39,8 +39,12 @@ public class ComponentLocationResolver i
StringBuffer baseLocation =
ComponentLocationResolver.getBaseLocation(location);
URL fileUrl = UtilURL.fromFilename(baseLocation.toString());
- if (fileUrl == null && location.indexOf("jquery.ui.datepicker") ==
-1) { // We don't care for missing jquery.ui.datepicker i18n files, since "en"
as default is handled internally. If people want a missing translation they
have to add the file
- Debug.logWarning("Unable to get file URL for component location;
expanded location was [" + baseLocation + "], original location was [" +
location + "]", module);
+ if (fileUrl == null) {
+ if (location.indexOf("jquery.ui.datepicker") > -1) {
+ Debug.logWarning("A jquery.ui.datepicker i18n file is missing
for the language.country couple you want. Simply add it there: [" +
baseLocation + "]. Else anyway the 'en' default will be used", module);
+ } else {
+ Debug.logWarning("Unable to get file URL for component
location; expanded location was [" + baseLocation + "], original location was
[" + location + "]", module);
+ }
}
return fileUrl;
}
