Merge lp:~stevenk/launchpad/approximateduration-no-words into lp:launchpad

[Steve Kowalik]

[r=abentley][bug=138490] fmt:approximateduration has forgotten how to use words.

Utterly rip out all uses (as well as the code itself) of approximateduration(use_words) and fmt:approximateduration/use-digits.

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/canonical/launchpad/doc/presenting-lengths-of-time.txt'
--- lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2011-06-23 13:10:40 +0000
+++ lib/canonical/launchpad/doc/presenting-lengths-of-time.txt	2011-07-01 19:18:42 +0000
@@ -113,31 +113,31 @@
 
    >>> td = timedelta(seconds=55)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'a minute'
+   '1 minute'
    >>> td = timedelta(seconds=88.123)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'a minute'
+   '1 minute'
 
    >>> td = timedelta(seconds=90)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'two minutes'
+   '2 minutes'
    >>> td = timedelta(seconds=149.9181)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'two minutes'
+   '2 minutes'
 
    >>> td = timedelta(seconds=150)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'three minutes'
+   '3 minutes'
    >>> td = timedelta(seconds=199)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'three minutes'
+   '3 minutes'
 
    >>> td = timedelta(seconds=330)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'six minutes'
+   '6 minutes'
    >>> td = timedelta(seconds=375.1)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'six minutes'
+   '6 minutes'
 
    >>> td = timedelta(seconds=645)
    >>> test_tales('td/fmt:approximateduration', td=td)
@@ -156,11 +156,11 @@
 
    >>> td = timedelta(seconds=3570)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'an hour'
+   '1 hour'
 
    >>> td = timedelta(seconds=3899.99999)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'an hour'
+   '1 hour'
 
    >>> td = timedelta(seconds=5100.181)
    >>> test_tales('td/fmt:approximateduration', td=td)
@@ -176,7 +176,7 @@
 
    >>> td = timedelta(seconds=35850.2828)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'ten hours'
+   '10 hours'
 
    >>> td = timedelta(seconds=38000)
    >>> test_tales('td/fmt:approximateduration', td=td)
@@ -188,11 +188,11 @@
 
    >>> td = timedelta(seconds=171000)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'two days'
+   '2 days'
 
    >>> td = timedelta(seconds=900000)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'ten days'
+   '10 days'
 
    >>> td = timedelta(seconds=1160000)
    >>> test_tales('td/fmt:approximateduration', td=td)
@@ -200,11 +200,11 @@
 
    >>> td = timedelta(seconds=1500000)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'two weeks'
+   '2 weeks'
 
    >>> td = timedelta(seconds=6000000)
    >>> test_tales('td/fmt:approximateduration', td=td)
-   'ten weeks'
+   '10 weeks'
 
    >>> td = timedelta(seconds=6350400)
    >>> test_tales('td/fmt:approximateduration', td=td)

=== modified file 'lib/lp/app/browser/tales.py'
--- lib/lp/app/browser/tales.py	2011-06-30 13:11:41 +0000
+++ lib/lp/app/browser/tales.py	2011-07-01 19:18:42 +0000
@@ -2144,12 +2144,7 @@
         if name == 'exactduration':
             return self.exactduration()
         elif name == 'approximateduration':
-            use_words = True
-            if len(furtherPath) == 1:
-                if 'use-digits' == furtherPath[0]:
-                    furtherPath.pop()
-                    use_words = False
-            return self.approximateduration(use_words)
+            return self.approximateduration()
         else:
             raise TraversalError(name)
 
@@ -2179,19 +2174,12 @@
 
         return ', '.join(parts)
 
-    def approximateduration(self, use_words=True):
+    def approximateduration(self):
         """Return a nicely-formatted approximate duration.
 
-        E.g. 'an hour', 'three minutes', '1 hour 10 minutes' and so
-        forth.
+        E.g. '1 hour', '3 minutes', '1 hour 10 minutes' and so forth.
 
         See https://launchpad.canonical.com/PresentingLengthsOfTime.
-
-        :param use_words: Specificly determines whether or not to use
-            words for numbers less than or equal to ten.  Expanding
-            numbers to words makes sense when the number is used in
-            prose or a singualar item on a page, but when used in
-            a table, the words do not work as well.
         """
         # NOTE: There are quite a few "magic numbers" in this
         # implementation; they are generally just figures pulled
@@ -2224,10 +2212,8 @@
             (35, '30 seconds'),
             (45, '40 seconds'),
             (55, '50 seconds'),
-            (90, 'a minute'),
+            (90, '1 minute'),
         ]
-        if not use_words:
-            representation_in_seconds[-1] = (90, '1 minute')
 
         # Break representation_in_seconds into two pieces, to simplify
         # finding the correct display value, through the use of the
@@ -2235,7 +2221,7 @@
         second_boundaries, display_values = zip(*representation_in_seconds)
 
         # Is seconds small enough that we can produce a representation
-        # in seconds (up to 'a minute'?)
+        # in seconds (up to '1 minute'?)
         if seconds < second_boundaries[-1]:
             # Use the built-in bisection algorithm to locate the index
             # of the item which "seconds" sorts after.
@@ -2244,34 +2230,17 @@
             # Return the corresponding display value.
             return display_values[matching_element_index]
 
-        # More than a minute, approximately; our calculation strategy
-        # changes. From this point forward, we may also need a
-        # "verbal" representation of the number. (We never need a
-        # verbal representation of "1", because we tend to special
-        # case the number 1 for various approximations, and we usually
-        # use a word like "an", instead of "one", e.g. "an hour")
-        if use_words:
-            number_name = {
-                2: 'two', 3: 'three', 4: 'four', 5: 'five',
-                6: 'six', 7: 'seven', 8: 'eight', 9: 'nine',
-                10: 'ten'}
-        else:
-            number_name = dict((number, number) for number in range(2, 11))
-
         # Convert seconds into minutes, and round it.
         minutes, remaining_seconds = divmod(seconds, 60)
         minutes += remaining_seconds / 60.0
         minutes = int(round(minutes))
 
         if minutes <= 59:
-            return "%s minutes" % number_name.get(minutes, str(minutes))
+            return "%d minutes" % minutes
 
         # Is the duration less than an hour and 5 minutes?
         if seconds < (60 + 5) * 60:
-            if use_words:
-                return "an hour"
-            else:
-                return "1 hour"
+            return "1 hour"
 
         # Next phase: try and calculate an approximate duration
         # greater than one hour, but fewer than ten hours, to a 10
@@ -2290,12 +2259,11 @@
                 else:
                     return "%d hours %s minutes" % (hours, minutes)
             else:
-                number_as_text = number_name.get(hours, str(hours))
-                return "%s hours" % number_as_text
+                return "%d hours" % hours
 
         # Is the duration less than ten and a half hours?
         if seconds < (10.5 * 3600):
-            return '%s hours' % number_name[10]
+            return '10 hours'
 
         # Try to calculate the approximate number of hours, to a
         # maximum of 47.
@@ -2305,22 +2273,22 @@
 
         # Is the duration fewer than two and a half days?
         if seconds < (2.5 * 24 * 3600):
-            return '%s days' % number_name[2]
+            return '2 days'
 
         # Try to approximate to day granularity, up to a maximum of 13
         # days.
         days = int(round(seconds / (24 * 3600)))
         if days <= 13:
-            return "%s days" % number_name.get(days, str(days))
+            return "%s days" % days
 
         # Is the duration fewer than two and a half weeks?
         if seconds < (2.5 * 7 * 24 * 3600):
-            return '%s weeks' % number_name[2]
+            return '2 weeks'
 
         # If we've made it this far, we'll calculate the duration to a
         # granularity of weeks, once and for all.
         weeks = int(round(seconds / (7 * 24 * 3600.0)))
-        return "%s weeks" % number_name.get(weeks, str(weeks))
+        return "%d weeks" % weeks
 
 
 class LinkFormatterAPI(ObjectFormatterAPI):

=== modified file 'lib/lp/app/doc/tales.txt'
--- lib/lp/app/doc/tales.txt	2011-06-23 13:10:40 +0000
+++ lib/lp/app/doc/tales.txt	2011-07-01 19:18:42 +0000
@@ -1409,9 +1409,6 @@
     '2 days, 0 hours, 0 minutes, 0.0 seconds'
 
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
-    'two days'
-
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
     '2 days'
 
     >>> delta = timedelta(days=12, hours=6, minutes=30)
@@ -1421,17 +1418,11 @@
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
     '12 days'
 
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
-    '12 days'
-
     >>> delta = timedelta(days=0, minutes=62)
     >>> test_tales('delta/fmt:exactduration', delta=delta)
     '1 hour, 2 minutes, 0.0 seconds'
 
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
-    'an hour'
-
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
     '1 hour'
 
     >>> delta = timedelta(days=0, minutes=82)
@@ -1441,17 +1432,11 @@
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
     '1 hour 20 minutes'
 
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
-    '1 hour 20 minutes'
-
     >>> delta = timedelta(days=0, seconds=62)
     >>> test_tales('delta/fmt:exactduration', delta=delta)
     '1 minute, 2.0 seconds'
 
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
-    'a minute'
-
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
     '1 minute'
 
     >>> delta = timedelta(days=0, seconds=90)
@@ -1459,9 +1444,6 @@
     '1 minute, 30.0 seconds'
 
     >>> test_tales('delta/fmt:approximateduration', delta=delta)
-    'two minutes'
-
-    >>> test_tales('delta/fmt:approximateduration/use-digits', delta=delta)
     '2 minutes'
 
 

=== modified file 'lib/lp/bugs/templates/bugtarget-patches.pt'
--- lib/lp/bugs/templates/bugtarget-patches.pt	2011-02-03 20:54:43 +0000
+++ lib/lp/bugs/templates/bugtarget-patches.pt	2011-07-01 19:18:42 +0000
@@ -75,7 +75,7 @@
                              age python:view.patchAge(patch)"
                  tal:attributes="id string:patch-cell-${repeat/patch_task/index}">
                    <a tal:attributes="href python:view.proxiedUrlForLibraryFile(patch)"
-                      tal:content="age/fmt:approximateduration/use-digits"></a>
+                      tal:content="age/fmt:approximateduration"></a>
                <div class="popupTitle"
                     tal:attributes="id string:patch-popup-${repeat/patch_task/index};">
                  <p tal:define="submitter patch/message/owner">

=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2011-01-06 07:09:57 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2011-07-01 19:18:42 +0000
@@ -26,7 +26,7 @@
  * Recipe: person/recipe
  * Archive: archiveowner/ppa
  * Distroseries: distroseries
- * Duration: five minutes
+ * Duration: 5 minutes
  * Build Log: %s
  * Upload Log: 
  * Builder: http://launchpad.dev/builders/bob

=== modified file 'lib/lp/code/stories/codeimport/xx-codeimport-results.txt'
--- lib/lp/code/stories/codeimport/xx-codeimport-results.txt	2011-06-21 01:39:18 +0000
+++ lib/lp/code/stories/codeimport/xx-codeimport-results.txt	2011-07-01 19:18:42 +0000
@@ -29,19 +29,19 @@
     >>> import_results = find_tag_by_id(browser.contents, 'import-results')
     >>> print extract_text(import_results).replace('&mdash;', '--')
     Import started on 2007-12-07 on odin and finished on 2007-12-07
-      taking seven hours -- see the log
+      taking 7 hours -- see the log
     Import started on 2007-12-06 on odin and finished on 2007-12-06
-      taking six hours -- see the log
+      taking 6 hours -- see the log
     Import started on 2007-12-05 on odin and finished on 2007-12-05
-      taking five hours -- see the log
+      taking 5 hours -- see the log
     Import started on 2007-12-04 on odin and finished on 2007-12-04
-      taking four hours -- see the log
+      taking 4 hours -- see the log
     Import started on 2007-12-03 on odin and finished on 2007-12-03
-      taking three hours -- see the log
+      taking 3 hours -- see the log
     Import started on 2007-12-02 on odin and finished on 2007-12-02
-      taking two hours -- see the log
+      taking 2 hours -- see the log
     Import started on 2007-12-01 on odin and finished on 2007-12-01
-      taking an hour -- see the log
+      taking 1 hour -- see the log
 
 Each of the lines is prefixed with a tick if the result status was
 success, or a cross if the status was a failure.  The title of the image

=== modified file 'lib/lp/registry/browser/tests/poll-views.txt'
--- lib/lp/registry/browser/tests/poll-views.txt	2011-01-05 19:18:57 +0000
+++ lib/lp/registry/browser/tests/poll-views.txt	2011-07-01 19:18:42 +0000
@@ -101,7 +101,7 @@
     >>> print extract_text(view.render())
     Polls
     title - closes on ...
-    You have seven days left to vote in this poll.
+    You have 7 days left to vote in this poll.
     Show polls
 
     >>> login_person(owner)
@@ -109,7 +109,7 @@
     >>> print extract_text(view.render())
     Polls
     title - closes on ...
-    You have seven days left to vote in this poll.
+    You have 7 days left to vote in this poll.
     Show polls
     Create a poll
 

=== modified file 'lib/lp/registry/doc/teammembership-email-notification.txt'
--- lib/lp/registry/doc/teammembership-email-notification.txt	2011-05-31 05:25:55 +0000
+++ lib/lp/registry/doc/teammembership-email-notification.txt	2011-07-01 19:18:42 +0000
@@ -446,7 +446,7 @@
     To: [e-mail]
     Subject: Your membership in ubuntu-team is about to expire
     <BLANKLINE>
-    On ..., nine days from now, your membership
+    On ..., 9 days from now, your membership
     in the Ubuntu Team (ubuntu-team) Launchpad team
     is due to expire.
     <http://launchpad.dev/~ubuntu-team>
@@ -483,7 +483,7 @@
     To: [e-mail]
     Subject: launchpad-beta-testers will expire soon from ubuntu-team
     <BLANKLINE>
-    On ..., nine days from now, the membership
+    On ..., 9 days from now, the membership
     of Launchpad Beta Testers (launchpad-beta-testers) (which you are
     the owner of) in the Ubuntu Team (ubuntu-team) Launchpad team
     is due to expire.
@@ -517,7 +517,7 @@
     To: [e-mail]
     Subject: Your membership in ubuntu-team is about to expire
     <BLANKLINE>
-    On ..., nine days from now, your membership
+    On ..., 9 days from now, your membership
     in the Ubuntu Team (ubuntu-team) Launchpad team
     is due to expire.
     <http://launchpad.dev/~ubuntu-team>
@@ -539,7 +539,7 @@
     To: [e-mail]
     Subject: launchpad-beta-testers will expire soon from ubuntu-team
     <BLANKLINE>
-    On ..., nine days from now, the membership
+    On ..., 9 days from now, the membership
     of Launchpad Beta Testers (launchpad-beta-testers) (which you are
     the owner of) in the Ubuntu Team (ubuntu-team) Launchpad team
     is due to expire.
@@ -575,7 +575,7 @@
     To: [e-mail]
     Subject: Your membership in landscape-developers is about to expire
     <BLANKLINE>
-    On ..., nine days from now, your membership
+    On ..., 9 days from now, your membership
     in the Landscape Developers (landscape-developers) Launchpad team
     is due to expire.
     <http://launchpad.dev/~landscape-developers>

=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2011-05-04 02:45:25 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2011-07-01 19:18:42 +0000
@@ -87,7 +87,7 @@
    * Archive: ubuntu primary archive
    * Component: main
    * State: Failed to upload
-   * Duration: a minute
+   * Duration: 1 minute
    * Build Log: http://launchpad.dev/ubuntu/+source/cdrkit/1.0/+build/22/+fil=
   es/netapplet-1.0.0.tar.gz
    * Builder: http://launchpad.dev/builders/bob

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2011-05-03 02:39:30 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2011-07-01 19:18:42 +0000
@@ -22,7 +22,7 @@
     frog  386        Disabled
     Official distributions build status
     Processor  Builders  Queue
-    386        1         1 job (a minute)
+    386        1         1 job (1 minute)
     PPA build status
     Processor  Builders  Queue
     386        0         empty
@@ -44,7 +44,7 @@
     ...     find_tag_by_id(anon_browser.contents, 'official-queue-status'))
     Official distributions build status
     Processor  Builders  Queue
-    386        1         1 job (a minute)
+    386        1         1 job (1 minute)
 
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'ppa-queue-status',))
@@ -77,7 +77,7 @@
     ...     find_tag_by_id(anon_browser.contents, 'ppa-queue-status'))
     PPA build status
     Processor  Builders  Queue
-    386        0         1 job (a minute)
+    386        0         1 job (1 minute)
 
 If the archive for the build does not require virtual builders, then
 the pending job will appear in the 'official' queue. Since the build
@@ -99,7 +99,7 @@
     ...     find_tag_by_id(anon_browser.contents, 'official-queue-status'))
     Official distributions build status
     Processor  Builders  Queue
-    386        1         2 jobs (two minutes)
+    386        1         2 jobs (2 minutes)
 
 From this page, users with the appropriate permission can register new
 builders.

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2011-06-09 10:50:25 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt	2011-07-01 19:18:42 +0000
@@ -144,12 +144,12 @@
     Successfully built
     i386 build of commercialpackage 1.0-1 in ubuntu breezy-autotest RELEASE
     Build started on 2007-08-09 on an unknown build machine and finished
-    on 2007-08-09 taking ten minutes
+    on 2007-08-09 taking 10 minutes
     ------------------------------
     Failed to upload
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     Build started on 2007-04-19 on Bob The Builder and finished on 2007-04-20
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Failed to build
     i386 build of cdrkit 1.0 in ubuntu warty RELEASE
@@ -178,7 +178,7 @@
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)
     Build started on 2006-02-27 on Bob The Builder and finished on 2006-02-28
-    taking six minutes &mdash; see the log
+    taking 6 minutes &mdash; see the log
     ------------------------------
     Needs building
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE
@@ -201,22 +201,22 @@
     Successfully built
     i386 build of commercialpackage 1.0-1 in ubuntu breezy-autotest RELEASE
     Build started on 2007-08-09 on an unknown build machine and finished
-    on 2007-08-09 taking ten minutes
+    on 2007-08-09 taking 10 minutes
     ------------------------------
     Successfully built
     i386 build of pmount 0.1-1 in ubuntu hoary RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Successfully built
     hppa build of pmount 0.1-1 in ubuntu hoary RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Successfully built
     i386 build of pmount 0.1-1 in ubuntu breezy-autotest RELEASE
     Build started on 2005-03-24 on Bob The Builder and finished on 2005-03-25
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
 
     >>> anon_browser.getControl(name="build_state").value = ['depwait']
@@ -228,7 +228,7 @@
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)
     Build started on 2006-02-27 on Bob The Builder and finished on 2006-02-28
-    taking six minutes &mdash; see the log
+    taking 6 minutes &mdash; see the log
     ------------------------------
 
     >>> anon_browser.getControl(name="build_state").value = ['failed']
@@ -248,7 +248,7 @@
     Failed to build
     i386 build of pmount 0.1-1 in ubuntu warty RELEASE
     Build started on 2005-10-01 on Bob The Builder and finished on 2005-10-02
-    taking three minutes &mdash; see the log
+    taking 3 minutes &mdash; see the log
     ------------------------------
 
 == Form errors ==
@@ -314,17 +314,17 @@
     Successfully built
     i386 build of pmount 0.1-1 in ubuntu warty RELEASE
     Build started on 2007-07-23 and finished on 2007-07-24
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Failed to build
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     Build started on 2007-07-07 and finished on 2007-07-08
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Failed to build
     i386 build of cdrkit 1.0 in ubuntu warty RELEASE
     Build started on 2007-05-29 and finished on 2007-05-30
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
 
 In the second batch, additionally to the failed-to-build builds
@@ -337,7 +337,7 @@
     Failed to upload
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     Build started on 2007-04-19 and finished on 2007-04-20
-    taking a minute &mdash; see the log
+    taking 1 minute &mdash; see the log
     ------------------------------
     Failed to build
     i386 build of foobar 1.0 in ubuntu warty RELEASE
@@ -365,7 +365,7 @@
     Missing dependencies:
     cpp (&gt;= 4:4.0.1-3), gcc-4.0 (&gt;= 4.0.1-2)
     Build started on 2006-02-27 and finished on 2006-02-28
-    taking six minutes &mdash; see the log
+    taking 6 minutes &mdash; see the log
     ------------------------------
     ...
 

=== modified file 'lib/lp/translations/browser/tests/test_baseexportview.py'
--- lib/lp/translations/browser/tests/test_baseexportview.py	2010-10-05 00:08:16 +0000
+++ lib/lp/translations/browser/tests/test_baseexportview.py	2011-07-01 19:18:42 +0000
@@ -201,7 +201,7 @@
 
         backlog = timedelta(hours=2)
         self.assertEqual(
-            "The backlog is approximately two hours.",
+            "The backlog is approximately 2 hours.",
             self.view.describeBacklog(backlog).strip())
 
     def test_export_queue_status(self):

=== modified file 'lib/lp/translations/stories/buildfarm/xx-build-summary.txt'
--- lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2011-05-27 19:53:20 +0000
+++ lib/lp/translations/stories/buildfarm/xx-build-summary.txt	2011-07-01 19:18:42 +0000
@@ -158,4 +158,4 @@
     1 ... 1 of 1 result
     ...
     Translation template build
-    Build started ... and finished ... taking five minutes
+    Build started ... and finished ... taking 5 minutes