projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream
[debian/openrocket]
/
core
/
src
/
net
/
sf
/
openrocket
/
l10n
/
ExceptionSuppressingTranslator.java
diff --git
a/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
b/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
index dd916b6cde240c9464ea57bee78be6b291981695..1287822cc938ffaf7e2703587af1ae54ebb2a71c 100644
(file)
--- a/
core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
+++ b/
core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
@@
-29,7
+29,7
@@
public class ExceptionSuppressingTranslator implements Translator {
}
}
-
+
@Override
public String get(String key) {
try {
@Override
public String get(String key) {
try {
@@
-42,7
+42,18
@@
public class ExceptionSuppressingTranslator implements Translator {
}
}
-
+ @Override
+ public String get(String base, String text) {
+ return translator.get(base, text);
+ }
+
+
+ @Override
+ public String getBaseText(String base, String translation) {
+ return translator.getBaseText(base, translation);
+ }
+
+
private static synchronized void handleError(String key, MissingResourceException e) {
if (!errorReported) {
errorReported = true;
private static synchronized void handleError(String key, MissingResourceException e) {
if (!errorReported) {
errorReported = true;
@@
-50,4
+61,6
@@
public class ExceptionSuppressingTranslator implements Translator {
}
}
}
}
+
+
}
}