svn commit: r1143521 - in /wicket/trunk: wicket-core/src/test/java/org/apache/wicket/util/time/ wicket-util/src/main/java/org/apache/wicket/util/time/

[svenmeier]

Author: svenmeier
Date: Wed Jul  6 18:24:32 2011
New Revision: 1143521

URL: http://svn.apache.org/viewvc?rev=1143521&view=rev
Log:
reverted Duration localization

Removed:
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.properties
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration_de.properties
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration_fr.properties
Modified:
    
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/time/DurationTest.java
    
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java

Modified: 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/time/DurationTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/time/DurationTest.java?rev=1143521&r1=1143520&r2=1143521&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/time/DurationTest.java
 (original)
+++ 
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/time/DurationTest.java
 Wed Jul  6 18:24:32 2011
@@ -70,8 +70,8 @@ public final class DurationTest
 
                String value = NumberFormat.getNumberInstance().format(1.5);
 
-               assertEquals(value + " minutes", 
Duration.seconds(90).toString());
-               assertEquals("12 hours", Duration.days(0.5).toString());
+               assertEquals(value + " minutes", 
Duration.seconds(90).toString(Locale.US));
+               assertEquals("12 hours", 
Duration.days(0.5).toString(Locale.US));
        }
 
        /** */
@@ -104,9 +104,7 @@ public final class DurationTest
                assertEquals(Duration.minutes(90), Duration.valueOf("90 
minutes"));
                assertEquals(Duration.hours(1.5), Duration.valueOf("1.5 hour", 
Locale.US));
                assertEquals(Duration.hours(1.5), Duration.valueOf("1,5 hour", 
Locale.GERMAN));
-               assertEquals("1 hour", Duration.hours(1).toString(Locale.US));
                assertEquals("1.5 hours", 
Duration.hours(1.5).toString(Locale.US));
-               assertEquals("1 Stunde", 
Duration.hours(1).toString(Locale.GERMAN));
-               assertEquals("1,5 Stunden", 
Duration.hours(1.5).toString(Locale.GERMAN));
+               assertEquals("1,5 hours", 
Duration.hours(1.5).toString(Locale.GERMAN));
        }
 }

Modified: 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java?rev=1143521&r1=1143520&r2=1143521&view=diff
==============================================================================
--- 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java
 (original)
+++ 
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/time/Duration.java
 Wed Jul  6 18:24:32 2011
@@ -17,7 +17,6 @@
 package org.apache.wicket.util.time;
 
 import java.util.Locale;
-import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -536,29 +535,18 @@ public class Duration extends AbstractTi
        }
 
        /**
-        * Converts a value to a unit-suffixed value.
+        * Converts a value to a unit-suffixed value, taking care of English 
singular/plural suffix.
         * 
         * @param value
         *            a <code>double</code> value to format
         * @param units
-        *            the units
+        *            the units to apply singular or plural suffix to
         * @param locale
         *            the <code>Locale</code>
         * @return a <code>String</code> representation
         */
        private String unitString(final double value, final String units, final 
Locale locale)
        {
-               final String key;
-               if (value > 1.0)
-               {
-                       key = units + "s";
-               }
-               else
-               {
-                       key = units;
-               }
-
-               return StringValue.valueOf(value, locale) + " " +
-                       ResourceBundle.getBundle(Duration.class.getName(), 
locale).getString(key);
+               return StringValue.valueOf(value, locale) + " " + units + 
((value > 1.0) ? "s" : "");
        }
 }