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

[Jeroen T. Vermeulen]

Keep initializing TM.pofile on edge while production needs it.

= Bug 631259 =

Release-critical.

The work on bug 597539 finally removes our dependency on TranslationMessage.pofile, and stops initializing that field. But until rollout, the production code still relies on it while edge merrily produces records that have it nulled!

This fix simply restores the original initializer. (A diff against devel from 2010-09-03 shows my comment as the only difference in the file). I'll prepare a separate branch that removes it again after rollout.

Jeroen

[Michael Hudson-Doyle (mwhudson)]

Approved. I assume you're very confident this works as there's no test :-)

review: Approve

[Tim Penhey (thumper)]

review: Approve (release-critical)

=== modified file 'lib/lp/translations/model/potmsgset.py'
--- lib/lp/translations/model/potmsgset.py	2010-09-03 14:53:09 +0000
+++ lib/lp/translations/model/potmsgset.py	2010-09-06 04:32:46 +0000
@@ -843,9 +843,11 @@
                         imported_message.is_current = False
                 return None
             else:
+                # The pofile=pofile is only needed until 10.09 rollout.
                 matching_message = TranslationMessage(
                     potmsgset=self,
                     potemplate=pofile.potemplate,
+                    pofile=pofile,
                     language=pofile.language,
                     origin=origin,
                     submitter=submitter,

=== modified file 'lib/lp/translations/tests/test_translationmessage.py'
--- lib/lp/translations/tests/test_translationmessage.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translationmessage.py	2010-09-06 04:32:46 +0000
@@ -5,6 +5,7 @@
 
 __metaclass__ = type
 
+
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -15,6 +16,23 @@
 from lp.translations.model.potranslation import POTranslation
 
 
+class TestPOFileStillInitialized(TestCaseWithFactory):
+    """Until the 10.09 rollout, TranslationMessage.pofile is still needed.
+
+    This is a fix for just a few days.  We still need to initialize this
+    on edge while production still relies on it.
+
+    Remove this test, as well as the initialization of pofile in
+    POTMsgSet.updateTranslation, after 10.09 rollout.
+    """
+    layer = ZopelessDatabaseLayer
+
+    def test_pofile_still_initialized(self):
+        pofile = self.factory.makePOFile('sux')
+        tm = self.factory.makeTranslationMessage(pofile=pofile)
+        self.assertEqual(pofile, tm.pofile)
+
+
 class TestTranslationMessageFindIdenticalMessage(TestCaseWithFactory):
     """Tests for `TranslationMessage.findIdenticalMessage`."""