Merge lp:~jtv/launchpad/bug-643240 into lp:launchpad

[Jeroen T. Vermeulen]

Fix broken stories test on maverick.

= Bug 643240 =

A pagetest was breaking on Maverick due to an apparent change in how gettext reports an inconsistency between format specificiers ("%s" and such) between both msgids (singular and plural) on the one hand, and the translations on the other.

Since the exact text of the error message isn't relevant to the pagetest, I just replaced the changed part with "…"; but I left in most of the text since it still provides helpful context for reading the test.

To test,
{{{
./bin/test -vvc -m lp.translations -t stories/translations
}}}

(You really only need to wait for the first of these tests to pass though; the others are unaffected).

Jeroen

[Robert Collins (lifeless)]

doit

review: Approve

=== modified file 'lib/lp/translations/stories/translations/30-rosetta-pofile-translation-gettext-error.txt'
--- lib/lp/translations/stories/translations/30-rosetta-pofile-translation-gettext-error.txt	2007-09-14 18:12:05 +0000
+++ lib/lp/translations/stories/translations/30-rosetta-pofile-translation-gettext-error.txt	2010-09-20 05:51:38 +0000
@@ -42,8 +42,7 @@
   ...     u'Found %s invalid files')
   >>> user_browser.getControl(name='submit_translations').click()
 
-We got an error, that means the url should be the same.
-We are still in the same URL, because the system detected an error.
+Because of the error, we're still in on the same page.
 
   >>> print user_browser.url
   http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/es/+translate?start=20
@@ -61,8 +60,8 @@
     <td>
     </td><td>
       <div>
-        format specifications in 'msgid' and 'msgstr[0]' for argument 1 are
-        not the sameformat specifications in 'msgid' and 'msgstr[1]' for
+        format specifications in ... and 'msgstr[0]' for argument 1 are
+        not the sameformat specifications in ... and 'msgstr[1]' for
         argument 1 are not the same
       </div>
     </td>