Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / l10n / ClassBasedTranslator.java

diff --git a/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java b/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
index b4212dc95acf3a6bca69295f0ed49a0b8b6be62e..6281b6e8011ae89b0a67d1e1abe226891aed89f9 100644 (file)
--- a/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
+++ b/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
@@ -15,7 +15,7 @@ import net.sf.openrocket.util.BugException;
  */
 public class ClassBasedTranslator implements Translator {
        
-
+       
        private final Translator translator;
        private final String className;
        
@@ -41,7 +41,7 @@ public class ClassBasedTranslator implements Translator {
        }
        
        
-
+       
        @Override
        public String get(String key) {
                String classKey = className + "." + key;
@@ -63,7 +63,20 @@ public class ClassBasedTranslator 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 String getStackClass(int levels) {
                TraceException trace = new TraceException();
                StackTraceElement stack[] = trace.getStackTrace();
@@ -82,11 +95,10 @@ public class ClassBasedTranslator implements Translator {
        }
        
        
-
-
+       
+       
        // For unit testing purposes
        String getClassName() {
                return className;
        }
-       
 }