WW-4389 Solves typo in error message and introduces new message variable

Author: lukaszlenart

core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java

@@ -40,6 +40,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -350,7 +351,7 @@ protected boolean acceptFile(Object action, File file, String filename, String c
                 LOG.warn(errMsg);
             }
         } else if (maximumSize != null && maximumSize < file.length()) {
-            String errMsg = getTextMessage(action, "struts.messages.error.file.too.large", new String[]{inputName, filename, file.getName(), "" + file.length()});
+            String errMsg = getTextMessage(action, "struts.messages.error.file.too.large", new String[]{inputName, filename, file.getName(), "" + file.length(), getMaximumSizeStr(action)});
             if (validation != null) {
                 validation.addFieldError(inputName, errMsg);
             }
@@ -383,6 +384,10 @@ protected boolean acceptFile(Object action, File file, String filename, String c
         return fileIsAcceptable;
     }
 
+    private String getMaximumSizeStr(Object action) {
+        return NumberFormat.getNumberInstance(getLocaleProvider(action).getLocale()).format(maximumSize);
+    }
+
     /**
      * @param extensionCollection - Collection of extensions (all lowercase).
      * @param filename            - filename to check.

core/src/main/resources/org/apache/struts2/struts-messages.properties

@@ -27,7 +27,7 @@ struts.messages.invalid.file=Could not find a Filename for {0}. Verify that a va
 struts.messages.invalid.content.type=Could not find a Content-Type for {0}. Verify that a valid file was submitted.
 struts.messages.removing.file=Removing file {0} {1}
 struts.messages.error.uploading=Error uploading: {0}
-struts.messages.error.file.too.large=The file is to large to be uploaded: {0} "{1}" "{2}" {3}
+struts.messages.error.file.too.large=File {0} is too large to be uploaded. Maximum allowed size is {4} bytes?
 struts.messages.error.content.type.not.allowed=Content-Type not allowed: {0} "{1}" "{2}" {3}
 struts.messages.error.file.extension.not.allowed=File extension not allowed: {0} "{1}" "{2}" {3}