You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2010/04/23 12:24:33 UTC
svn commit: r937231 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
Author: johnh
Date: Fri Apr 23 10:24:33 2010
New Revision: 937231
URL: http://svn.apache.org/viewvc?rev=937231&view=rev
Log:
Fix opensocial-i18n: load data from appropriate resource directory.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java?rev=937231&r1=937230&r2=937231&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java Fri Apr 23 10:24:33 2010
@@ -75,8 +75,8 @@ public class OpenSocialI18NGadgetRewrite
String dateTimeConstantsResource = "DateTimeConstants__" + localeName + ".js";
String numberConstantsResource = "NumberFormatConstants__" + localeName + ".js";
try {
- inlineJs.append(ResourceLoader.getContent(dateTimeConstantsResource))
- .append('\n').append(ResourceLoader.getContent(numberConstantsResource));
+ inlineJs.append(attemptToLoadResource(dateTimeConstantsResource))
+ .append('\n').append(attemptToLoadResource(numberConstantsResource));
i18nConstantsCache.put(locale, inlineJs.toString());
} catch (IOException e) {
throw new GadgetException(GadgetException.Code.INVALID_CONFIG,
@@ -95,24 +95,30 @@ public class OpenSocialI18NGadgetRewrite
String country = locale.getCountry();
if (!language.equalsIgnoreCase("ALL")) {
try {
- attemptToLoadResource(language);
+ attemptToLoadDateConstants(language);
localeName = language;
} catch (IOException e) { }
}
if (!country.equalsIgnoreCase("ALL")) {
try {
- attemptToLoadResource(localeName + '_' + country);
+ attemptToLoadDateConstants(localeName + '_' + country);
localeName += '_' + country;
} catch (IOException e) { }
}
return localeName;
}
- protected String attemptToLoadResource(String localeName) throws IOException {
- return ResourceLoader.getContent(DATA_PATH
- + "DateTimeConstants__" + localeName
- + ".js");
+ private String attemptToLoadDateConstants(String localeName) throws IOException {
+ return attemptToLoadResource("DateTimeConstants__" + localeName + ".js");
+ }
+
+ private String attemptToLoadResource(String i18nRes) throws IOException {
+ return attemptToLoadResourceFullyQualified(DATA_PATH + i18nRes);
+ }
+
+ protected String attemptToLoadResourceFullyQualified(String resource) throws IOException {
+ return ResourceLoader.getContent(resource);
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java?rev=937231&r1=937230&r2=937231&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriterTest.java Fri Apr 23 10:24:33 2010
@@ -117,8 +117,7 @@ public class OpenSocialI18NGadgetRewrite
}
@Override
- protected String attemptToLoadResource(String localeName) throws IOException {
- String resource = "features/i18n/data/DateTimeConstants__" + localeName + ".js";
+ protected String attemptToLoadResourceFullyQualified(String resource) throws IOException {
if (resources.containsKey(resource)) {
return resources.get(resource);
} else {