Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/taglib
In directory james.mmbase.org:/tmp/cvs-serv11452
Modified Files:
TranslateTable.java
Log Message:
spacing only
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/taglib
Index: TranslateTable.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/taglib/TranslateTable.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- TranslateTable.java 26 Jul 2007 14:32:01 -0000 1.18
+++ TranslateTable.java 22 Jan 2008 08:49:36 -0000 1.19
@@ -1,5 +1,7 @@
package nl.didactor.taglib;
-import org.mmbase.util.*;
+import org.mmbase.util.ResourceLoader;
+import org.mmbase.util.ResourceWatcher;
+import org.mmbase.util.ReaderInputStream;
import java.util.*;
import java.io.*;
@@ -23,7 +25,7 @@
* <p>
* The translationtable will walk the current directory and
* read all files found in it.
- * @version $Id: TranslateTable.java,v 1.18 2007/07/26 14:32:01 michiel Exp $
+ * @version $Id: TranslateTable.java,v 1.19 2008/01/22 08:49:36 michiel Exp $
*/
public class TranslateTable {
private static final Logger log =
Logging.getLoggerInstance(TranslateTable.class);
@@ -221,7 +223,7 @@
- public static Locale degrade(Locale locale, Locale originalLocale) {
+ protected static Locale degrade(Locale locale, Locale originalLocale) {
String language = locale.getLanguage();
String country = locale.getCountry();
String variant = locale.getVariant();
@@ -293,6 +295,9 @@
Locale locale = translationLocale;
StringTokenizer st = new StringTokenizer(tkey, ".");
+ if (! st.hasMoreTokens()) {
+ return "???[" + tkey + "]";
+ }
String namespace = st.nextToken();
if (!st.hasMoreTokens()) {
log.error("Cannot translate key with no namespace: '" + tkey +
"'");
@@ -309,7 +314,9 @@
if (translation != null) {
return translation;
} else {
+ Locale prev = locale;
locale = degrade(locale, translationLocale);
+ log.debug("degraded " + prev + " to " + locale + " because '"
+ gkey + "' not found");
}
if (locale == null) {
TranslateTable def = getDefault();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
