Ticket #6771: 6771.patch

src/org/openstreetmap/josm/tools/I18n.java

@@ -146 +146 @@
      * @see #trnc
      */
     public static final String tr(String text, Object... objects) {
+        if (text == null)
+            return null;
         return MessageFormat.format(gettext(text, null), objects);
     }
 
@@ -219 +221 @@
      * @see #trnc
      */
     public static final String trn(String singularText, String pluralText, long n, Object... objects) {
-        return MessageFormat.format(gettextn(singularText, pluralText, null, n), objects);
+        String text = gettextn(singularText, pluralText, null, n);
+        if (text == null)
+            return null;
+        return MessageFormat.format(text, objects);
     }
 
     /**
@@ -246 +251 @@
      * @see #trn
      */
     public static final String trnc(String context, String singularText, String pluralText, long n, Object... objects) {
-        return MessageFormat.format(gettextn(singularText, pluralText, context, n), objects);
+        String text = gettextn(singularText, pluralText, context, n);
+        if (text == null)
+            return null;
+        return MessageFormat.format(text, objects);
     }
 
     private static final String gettext(String text, String ctx, boolean lazy)
@@ -283 +291 @@
 
     private static final String gettextn(String text, String plural, String ctx, long num)
     {
+        if (text == null)
+            return null;
         int i;
         if(ctx == null && text.startsWith("_:") && (i = text.indexOf("\n")) >= 0)
         {