remove Id keyword

[jSite2.git] / src / net / pterodactylus / jsite / i18n / I18n.java

diff --git a/src/net/pterodactylus/jsite/i18n/I18n.java b/src/net/pterodactylus/jsite/i18n/I18n.java
index 504dc88..8223a0b 100644 (file)
--- a/src/net/pterodactylus/jsite/i18n/I18n.java
+++ b/src/net/pterodactylus/jsite/i18n/I18n.java
@@ -31,19 +31,24 @@ import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.KeyStroke;
 
 import net.pterodactylus.util.io.Closer;
+import net.pterodactylus.util.logging.Logging;
 
 /**
  * Class that handles i18n.
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class I18n {
 
+       /** Logger. */
+       private static final Logger logger = Logging.getLogger(I18n.class.getName());
+
        /** List of I18nables that are notified when the language changes. */
        private static final List<I18nable> i18nables = new ArrayList<I18nable>();
 
@@ -87,7 +92,9 @@ public class I18n {
                String value = null;
                value = currentLanguage.getProperty(key);
                if (value == null) {
-                       return key;
+                       logger.log(Level.WARNING, "please fix “" + key + "”!", new Throwable());
+                       /* TODO - replace with value when done! */
+                       return null;
                }
                if ((parameters != null) && (parameters.length > 0)) {
                        return MessageFormat.format(value, parameters);
@@ -106,10 +113,7 @@ public class I18n {
         */
        public static int getKey(String key) {
                String value = currentLanguage.getProperty(key);
-               if (value == null) {
-                       return -1;
-               }
-               if (value.startsWith("VK_")) {
+               if ((value != null) && value.startsWith("VK_")) {
                        try {
                                Field field = KeyEvent.class.getField(value);
                                return field.getInt(null);
@@ -123,7 +127,8 @@ public class I18n {
                                /* ignore. */
                        }
                }
-               return value.toUpperCase().charAt(0);
+               System.err.println("please fix “" + key + "”!");
+               return KeyEvent.VK_UNDEFINED;
        }
 
        /**
@@ -151,6 +156,9 @@ public class I18n {
                                modifierMask |= InputEvent.SHIFT_DOWN_MASK;
                        } else {
                                if (keyToken.startsWith("VK_")) {
+                                       if (keyToken.equals("VK_UNDEFINED")) {
+                                               return null;
+                                       }
                                        try {
                                                Field field = KeyEvent.class.getField(keyToken);
                                                return KeyStroke.getKeyStroke(field.getInt(null), modifierMask);