fixing missing localization problem for options and arguments

kohsuke · Aug 17, 2015 · 0b63e00 · 0b63e00
1 parent 8a250ca
commit 0b63e00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/args4j/src/org/kohsuke/args4j/CmdLineParser.java b/args4j/src/org/kohsuke/args4j/CmdLineParser.java
@@ -366,7 +366,9 @@ private String createDefaultValuePart(OptionHandler handler) {
     }
 
     private String localize(String s, ResourceBundle rb) {
-        if(rb!=null)    return rb.getString(s);
+        if(rb!=null && rb.containsKey(s)) {
+            return rb.getString(s);
+        }
         return s;
     }
 

diff --git a/args4j/src/org/kohsuke/args4j/spi/OptionHandler.java b/args4j/src/org/kohsuke/args4j/spi/OptionHandler.java
@@ -82,10 +82,8 @@ public String getMetaVariable(ResourceBundle rb) {
             token = getDefaultMetaVariable();
         if(token==null) return null;
 
-        if(rb!=null) {
-            String localized = rb.getString(token);
-            if(localized!=null)
-                token = localized;
+        if(rb!=null && rb.containsKey(token)) {
+            token = rb.getString(token);
         }
 
         return token;