projects
/
jSite2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add node-is-still-connected dialog texts
[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
4a244c5
..
db97d0b
100644
(file)
--- a/
src/net/pterodactylus/jsite/i18n/I18n.java
+++ b/
src/net/pterodactylus/jsite/i18n/I18n.java
@@
-24,6
+24,7
@@
import java.awt.event.KeyEvent;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Properties;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Properties;
@@
-65,19
+66,27
@@
public class I18n {
}
/**
}
/**
- * Returns the translated value for a key.
+ * Returns the translated value for a key. The translated values may contain
+ * placeholders that are replaced with the given parameters.
*
*
+ * @see MessageFormat
* @param key
* The key to get
* @param key
* The key to get
+ * @param parameters
+ * The parameters in case the translated value contains
+ * placeholders
* @return The translated message, or the key itself if no translation could
* be found
*/
* @return The translated message, or the key itself if no translation could
* be found
*/
- public static String get(String key) {
+ public static String get(String key
, Object... parameters
) {
String value = null;
value = currentLanguage.getProperty(key);
if (value == null) {
return key;
}
String value = null;
value = currentLanguage.getProperty(key);
if (value == null) {
return key;
}
+ if ((parameters != null) && (parameters.length > 0)) {
+ return MessageFormat.format(value, parameters);
+ }
return value;
}
return value;
}
@@
-136,7
+145,6
@@
public class I18n {
if (keyToken.startsWith("VK_")) {
try {
Field field = KeyEvent.class.getField(keyToken);
if (keyToken.startsWith("VK_")) {
try {
Field field = KeyEvent.class.getField(keyToken);
- System.out.println("asked for: “" + key + "”, will return " + field.getInt(null));
return KeyStroke.getKeyStroke(field.getInt(null), modifierMask);
} catch (SecurityException e) {
/* ignore. */
return KeyStroke.getKeyStroke(field.getInt(null), modifierMask);
} catch (SecurityException e) {
/* ignore. */
@@
-148,7
+156,6
@@
public class I18n {
/* ignore. */
}
}
/* ignore. */
}
}
- System.out.println("asked for: “" + key + "”, will return " + keyToken.charAt(0));
return KeyStroke.getKeyStroke(keyToken.charAt(0), modifierMask);
}
}
return KeyStroke.getKeyStroke(keyToken.charAt(0), modifierMask);
}
}