svn commit: r1205322 - in /wicket/branches/wicket-1.5.x/wicket-extensions: ./ src/main/java/ src/main/java/org/apache/wicket/extensions/ src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/

[svenmeier]

Author: svenmeier
Date: Wed Nov 23 08:24:47 2011
New Revision: 1205322

URL: http://svn.apache.org/viewvc?rev=1205322&view=rev
Log:
WICKET-4162 InitializerStringResourceLoader for default string resources

Added:
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
      - copied unchanged from r1204836, 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties
      - copied unchanged from r1204836, 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_de.properties
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml
      - copied unchanged from r1204836, 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer_fr.properties.xml
Removed:
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/wicket-jar.properties
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/wicket-jar_de.properties
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/wicket-jar_fr.properties.xml
Modified:
    wicket/branches/wicket-1.5.x/wicket-extensions/   (props changed)
    
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java

Propchange: wicket/branches/wicket-1.5.x/wicket-extensions/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 23 08:24:47 2011
@@ -2,3 +2,4 @@
 /wicket/branches/wicket-1.4.x/wicket-extensions:963681
 
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions:760296-760351,760353-760355
 /wicket/trunk/wicket-devutils/wicket-extensions:760352
+/wicket/trunk/wicket-extensions:1204836,1204865

Modified: 
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java?rev=1205322&r1=1205321&r2=1205322&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
 (original)
+++ 
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
 Wed Nov 23 08:24:47 2011
@@ -101,11 +101,7 @@ class UploadStatusResource extends Abstr
                {
                        status = info.getPercentageComplete() +
                                "|" +
-                               new StringResourceModel(
-                                       RESOURCE_STATUS,
-                                       (Component)null,
-                                       Model.of(info),
-                                       "${percentageComplete}% finished, 
${bytesUploadedString} of ${totalBytesString} at ${transferRateString}; 
${remainingTimeString}").getString();
+                               new StringResourceModel(RESOURCE_STATUS, 
(Component)null, Model.of(info)).getString();
                }
                return status;
        }