Author: michiel
Date: 2010-02-17 19:53:32 +0100 (Wed, 17 Feb 2010)
New Revision: 41120
Modified:
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTable.java
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTag.java
Log:
sigh
Modified:
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTable.java
===================================================================
---
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTable.java
2010-02-17 18:27:14 UTC (rev 41119)
+++
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTable.java
2010-02-17 18:53:32 UTC (rev 41120)
@@ -96,18 +96,15 @@
protected static synchronized void readResource(ResourceLoader loader,
String resource) {
// filename has the form: namespace.locale.properties
StringTokenizer st = new StringTokenizer(resource, ".");
- String namespace = st.nextToken();
+ final String namespace = st.nextToken();
// If there is no '.' in the filename then it's not a valid
translation file
if (!st.hasMoreTokens()) {
+ log.debug("Ignored " + resource);
return;
}
String locale = st.nextToken();
- String properties = "";
- if (st.hasMoreTokens()) {
- properties = st.nextToken();
- } else {
- properties = locale;
+ if (! st.hasMoreTokens()) {
locale = "";
}
@@ -121,7 +118,7 @@
new
UnicodeEscaper()),
"ISO-8859-1");
props.load(in);
-
+ log.debug("Read " + resource + " from (" + namespace + ") for " +
locale);
for (Map.Entry entry : props.entrySet()) {
String key = (String) entry.getKey();
String value = (String) entry.getValue();
Modified:
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTag.java
===================================================================
---
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTag.java
2010-02-17 18:27:14 UTC (rev 41119)
+++
didactor/trunk/components/core/src/main/java/nl/didactor/taglib/TranslateTag.java
2010-02-17 18:53:32 UTC (rev 41120)
@@ -16,6 +16,7 @@
/**
* Translate tag: it will figure out a translation for a given
* abstract locale.
+ * @TODO This is absolutely the same as fmt:message. It should be dropped
* @author Johannes Verelst <[email protected]>
*/
public class TranslateTag extends ContextReferrerTag implements Writer { //,
ParamHandler {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
