Merge lp:~henninge/launchpad/db-devel-bug-611668-filtermethods-2 into lp:launchpad/db-devel

[Henning Eggers]

== Details ==

This branch continues the quest for the transformation of the messsage filter methods to the new translations model. It contains the following changes:

 * Create TestUpstreamFilters and TestUbuntuFilters from
   the scenario created in the previous branch.
 * Rename getPOTMsgSetChangedInUbuntu to
   getPOTMsgSetDifferentTranslations because the old name
   was specific to the old model.
 * Make the getPOTMsgSet* methods side-aware,
   i.e. convert them to the new model.
 * Convert all of test_pofile.py to the new model (i.e.
   use makeCurrentTranslationMessage). Part of this was
   needed to make the tests pass again.

== Tests ==

bin/test -vvcm lp.translations.tests.test_pofile

pofile.txt ist still failng that will be fixed in the next branch.

[Leonard Richardson (leonardr)]

I approve with what are hopefully minor changes. Specifically, I found test_getPOTMsgSetDifferentTranslations very confusing. The comments and sample code are talking about "one side" and "both sides"--it would be easier for me to understand if you specified "upstream side but not Ubuntu side" and "both upstream and ubuntu sides", especially since the things you're testing are .is_current_ubuntu and .is_current_upstream.

You also use "diverged" vs. "changed" in that test without explaining the difference. I can almost figure out what you mean by looking at the test, but not quite because a) you never explained what "changed" means (on IRC you said it was an old term, so why still use it?)--what has changed? And it's not clear why setting diverged=True makes is_current_upstream True and is_current_ubuntu False, instead of vice versa.

This is the change that might not be minor: what would happen if I passed in both current_other=True and diverged=True? Would I get an error, or would one of those arguments win? It seems like there should be a single 'status' argument which can take on different values like (just making these up) 'current', 'ubuntu_diverged' or 'upstream_diverged'. Maybe it's too late to change the method signature like this, but that would make this whole system a lot more comprehensible.

review: Approve

[Henning Eggers (henninge)]

Thank you for the review. I did not get to work on this any further because we reverted the recife branch from db-devel again, so this change got less urgent. I am finishing this now but will merge it into the recife branch (which will soon be merged into db-devel again, I expect).

> I approve with what are hopefully minor changes. Specifically, I found
> test_getPOTMsgSetDifferentTranslations very confusing. The comments and sample
> code are talking about "one side" and "both sides"--it would be easier for me
> to understand if you specified "upstream side but not Ubuntu side" and "both
> upstream and ubuntu sides", especially since the things you're testing are
> .is_current_ubuntu and .is_current_upstream.

I can see how this is confusing. I did two things: I added a note explaining about the situation in this test and I also added method that pick the right flag for "this side" and "other side" so that the whole test only uses those terms.

>
> You also use "diverged" vs. "changed" in that test without explaining the
> difference. I can almost figure out what you mean by looking at the test, but
> not quite because a) you never explained what "changed" means (on IRC you said
> it was an old term, so why still use it?)--what has changed?

I removed the term "changed" from the code, so this should be less confusing now.

> And it's not
> clear why setting diverged=True makes is_current_upstream True and
> is_current_ubuntu False, instead of vice versa.

Diverging a translation makes it the current translation on "this side" which in this case is "upstream". As mentioned earlier I made that clearer by removing direct references to "is_current_upstream" and "is_current_ubuntu".

> This is the change that might not be minor: what would happen if I passed in
> both current_other=True and diverged=True? Would I get an error, or would one
> of those arguments win?

No, that combination makes no sense and the factory method has an assertion for it.

> It seems like there should be a single 'status'
> argument which can take on different values like (just making these up)
> 'current', 'ubuntu_diverged' or 'upstream_diverged'. Maybe it's too late to
> change the method signature like this, but that would make this whole system a
> lot more comprehensible.

Well, maybe not too late but certainly not for this branch. Changing the factory signature would mean also changing a lot of tests that use it. Maybe we are missing some good documentation that explains the different states and such? This may be a Good Thing to improve in light of what is coming...

Cheers,
Henning

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2010-12-01 11:26:57 +0000
+++ lib/lp/translations/browser/pofile.py	2010-12-07 19:31:29 +0000
@@ -436,8 +436,13 @@
             'translated': self.context.getPOTMsgSetTranslated,
             'untranslated': self.context.getPOTMsgSetUntranslated,
             'new_suggestions': self.context.getPOTMsgSetWithNewSuggestions,
+<<<<<<< TREE
             'changed_in_launchpad':
                 self.context.getPOTMsgSetChangedInLaunchpad,
+=======
+            'changed_in_ubuntu':
+                self.context.getPOTMsgSetDifferentTranslations,
+>>>>>>> MERGE-SOURCE
             }
 
         if self.show not in get_functions:
@@ -964,8 +969,13 @@
             'translated': self.context.getPOTMsgSetTranslated,
             'untranslated': self.context.getPOTMsgSetUntranslated,
             'new_suggestions': self.context.getPOTMsgSetWithNewSuggestions,
+<<<<<<< TREE
             'changed_in_launchpad':
                 self.context.getPOTMsgSetChangedInLaunchpad,
+=======
+            'changed_in_ubuntu':
+                self.context.getPOTMsgSetDifferentTranslations,
+>>>>>>> MERGE-SOURCE
             }
 
         if self.show not in get_functions:

=== modified file 'lib/lp/translations/doc/pofile.txt'
--- lib/lp/translations/doc/pofile.txt	2010-12-07 19:31:22 +0000
+++ lib/lp/translations/doc/pofile.txt	2010-12-07 19:31:29 +0000
@@ -46,7 +46,11 @@
     >>> dummy_pofile.getPOTMsgSetTranslated().count()
     0
 
+<<<<<<< TREE
     >>> dummy_pofile.getPOTMsgSetChangedInLaunchpad().count()
+=======
+    >>> dummy_pofile.getPOTMsgSetDifferentTranslations().count()
+>>>>>>> MERGE-SOURCE
     0
 
     >>> dummy_pofile.getPOTMsgSetWithNewSuggestions().count()

=== modified file 'lib/lp/translations/interfaces/pofile.py'
--- lib/lp/translations/interfaces/pofile.py	2010-12-01 11:26:57 +0000
+++ lib/lp/translations/interfaces/pofile.py	2010-12-07 19:31:29 +0000
@@ -181,11 +181,16 @@
         """Get pot message sets with suggestions submitted after last review.
         """
 
+<<<<<<< TREE
     def getPOTMsgSetChangedInLaunchpad():
         """Get pot message sets changed through Launchpad in this PO file.
 
         'Changed in Launchpad' are only those which were translated when
         initially imported, but then got overridden in Launchpad.
+=======
+    def getPOTMsgSetDifferentTranslations():
+        """Get pot message sets with different translations on both sides.
+>>>>>>> MERGE-SOURCE
         """
 
     def getPOTMsgSetWithErrors():

=== modified file 'lib/lp/translations/model/pofile.py'
--- lib/lp/translations/model/pofile.py	2010-12-07 19:31:22 +0000
+++ lib/lp/translations/model/pofile.py	2010-12-07 19:31:29 +0000
@@ -691,9 +691,15 @@
         Return a tuple of SQL (clauses, clause_tables) to be used with
         POTMsgSet.select().
         """
+        flag_name = getUtility(ITranslationSideTraitsSet).getForTemplate(
+            self.potemplate).flag_name
         clause_tables = ['TranslationTemplateItem', 'TranslationMessage']
         clauses = self._getClausesForPOFileMessages()
+<<<<<<< TREE
         clauses.append('TranslationMessage.is_current IS TRUE')
+=======
+        clauses.append('TranslationMessage.%s IS TRUE' % flag_name)
+>>>>>>> MERGE-SOURCE
         self._appendCompletePluralFormsConditions(clauses)
 
         # A message is current in this pofile if:
@@ -712,11 +718,19 @@
                  SELECT * FROM TranslationMessage AS diverged
                    WHERE
                      diverged.potemplate=%(potemplate)s AND
+<<<<<<< TREE
                      diverged.is_current IS TRUE AND
+=======
+                     diverged.%(flag_name)s IS TRUE AND
+>>>>>>> MERGE-SOURCE
                      diverged.language = %(language)s AND
                      diverged.potmsgset=TranslationMessage.potmsgset)''' % (
-            dict(language=quote(self.language),
-                 potemplate=quote(self.potemplate))),
+                dict(
+                     flag_name=flag_name,
+                     language=quote(self.language),
+                     potemplate=quote(self.potemplate),
+                     )
+                ),
         ]
         shared_translation_query = ' AND '.join(shared_translation_clauses)
 
@@ -768,23 +782,35 @@
 
     def getPOTMsgSetWithNewSuggestions(self):
         """See `IPOFile`."""
+        flag_name = getUtility(ITranslationSideTraitsSet).getForTemplate(
+            self.potemplate).flag_name
         clauses = self._getClausesForPOFileMessages()
         msgstr_clause = make_plurals_sql_fragment(
             "TranslationMessage.msgstr%(form)d IS NOT NULL", "OR")
         clauses.extend([
             'TranslationTemplateItem.potmsgset = POTMsgSet.id',
+<<<<<<< TREE
             'TranslationMessage.is_current IS NOT TRUE',
             "(%s)" % msgstr_clause,
+=======
+            'TranslationMessage.%s IS NOT TRUE' % flag_name,
+            "(%s)" % msgstr_clause
+>>>>>>> MERGE-SOURCE
             ])
 
         diverged_translation_query = (
             '''(SELECT COALESCE(diverged.date_reviewed, diverged.date_created)
                  FROM TranslationMessage AS diverged
                  WHERE
+<<<<<<< TREE
                    diverged.is_current IS TRUE AND
+=======
+                   diverged.%(flag_name)s IS TRUE AND
+>>>>>>> MERGE-SOURCE
                    diverged.potemplate = %(potemplate)s AND
                    diverged.language = %(language)s AND
                    diverged.potmsgset=POTMsgSet.id)''' % dict(
+            flag_name=flag_name,
             potemplate=quote(self.potemplate),
             language=quote(self.language)))
 
@@ -792,10 +818,15 @@
             '''(SELECT COALESCE(shared.date_reviewed, shared.date_created)
                  FROM TranslationMessage AS shared
                  WHERE
+<<<<<<< TREE
                    shared.is_current IS TRUE AND
+=======
+                   shared.%(flag_name)s IS TRUE AND
+>>>>>>> MERGE-SOURCE
                    shared.potemplate IS NULL AND
                    shared.language = %(language)s AND
                    shared.potmsgset=POTMsgSet.id)''' % dict(
+            flag_name=flag_name,
             language=quote(self.language)))
         beginning_of_time = "TIMESTAMP '1970-01-01 00:00:00'"
         newer_than_query = (
@@ -818,41 +849,71 @@
         return self._getOrderedPOTMsgSets(
             [POTMsgSet, TranslationTemplateItem], query)
 
+<<<<<<< TREE
     def getPOTMsgSetChangedInLaunchpad(self):
+=======
+    def getPOTMsgSetDifferentTranslations(self):
+>>>>>>> MERGE-SOURCE
         """See `IPOFile`."""
+<<<<<<< TREE
         # POT set has been changed in Launchpad if it contains active
         # translation which didn't come from a published package
         # (iow, it's different from a published translation: this only
         # lists translations which have actually changed in LP, not
         # translations which are 'new' and only exist in LP).
+=======
+        # A `POTMsgSet` has different translations if both sides have a
+        # translation. If one of them is empty, the POTMsgSet is not included
+        # in this list. 
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
         # TranslationMessage is changed if:
         # is_current IS TRUE, is_imported IS FALSE,
         # (diverged AND not empty) OR (shared AND not empty AND no diverged)
         # exists imported (is_imported AND not empty AND (diverged OR shared))
+=======
+>>>>>>> MERGE-SOURCE
         clauses, clause_tables = self._getTranslatedMessagesQuery()
+        other_side_flag_name = getUtility(
+            ITranslationSideTraitsSet).getForTemplate(
+                self.potemplate).other_side_traits.flag_name
         clauses.extend([
             'TranslationTemplateItem.potmsgset = POTMsgSet.id',
+<<<<<<< TREE
             'TranslationMessage.is_imported IS FALSE',
+=======
+            'TranslationMessage.%s IS FALSE' % other_side_flag_name,
+>>>>>>> MERGE-SOURCE
             ])
 
         imported_no_diverged = (
             '''NOT EXISTS (
                  SELECT * FROM TranslationMessage AS diverged
                    WHERE
+<<<<<<< TREE
                      diverged.is_imported IS TRUE AND
+=======
+                     diverged.%(flag_name)s IS TRUE AND
+>>>>>>> MERGE-SOURCE
                      diverged.id <> imported.id AND
                      diverged.potemplate = %(potemplate)s AND
                      diverged.language = %(language)s AND
                      diverged.potmsgset=TranslationMessage.potmsgset)''' % (
-            dict(potemplate=quote(self.potemplate),
-                 language=quote(self.language))))
-
+                dict(
+                    flag_name=other_side_flag_name,
+                    potemplate=quote(self.potemplate),
+                    language=quote(self.language))
+                    ))
         imported_clauses = [
             'imported.id <> TranslationMessage.id',
             'imported.potmsgset = POTMsgSet.id',
             'imported.language = %s' % sqlvalues(self.language),
+<<<<<<< TREE
             'imported.is_imported IS TRUE',
+=======
+            'imported.%s IS TRUE' % other_side_flag_name,
+>>>>>>> MERGE-SOURCE
             '(imported.potemplate=%s OR ' % sqlvalues(self.potemplate) +
             '   (imported.potemplate IS NULL AND ' + imported_no_diverged
             + '  ))',
@@ -1506,11 +1567,15 @@
         """See `IPOFile`."""
         return EmptyResultSet()
 
+<<<<<<< TREE
     def getPOTMsgSetChangedInLaunchpad(self):
         """See `IPOFile`."""
         return EmptyResultSet()
 
     def getPOTMsgSetWithErrors(self):
+=======
+    def getPOTMsgSetDifferentTranslations(self):
+>>>>>>> MERGE-SOURCE
         """See `IPOFile`."""
         return EmptyResultSet()
 

=== modified file 'lib/lp/translations/tests/test_pofile.py'
--- lib/lp/translations/tests/test_pofile.py	2010-12-07 19:31:22 +0000
+++ lib/lp/translations/tests/test_pofile.py	2010-12-07 19:31:29 +0000
@@ -54,6 +54,175 @@
     ITranslationsPerson(person).translations_relicensing_agreement = choice
 
 
+<<<<<<< TREE
+=======
+class TestTranslationSharedPOFileSourcePackage(TestCaseWithFactory):
+    """Test behavior of PO files with shared POTMsgSets on a source package.
+    """
+
+    layer = ZopelessDatabaseLayer
+
+    def setUp(self):
+        # Create a product with two series and a shared POTemplate
+        # in different series ('devel' and 'stable').
+        super(TestTranslationSharedPOFileSourcePackage, self).setUp()
+        self.foo = self.factory.makeDistribution()
+        self.foo_devel = self.factory.makeDistroSeries(
+            name='devel', distribution=self.foo)
+        self.foo_stable = self.factory.makeDistroSeries(
+            name='stable', distribution=self.foo)
+        self.foo.official_rosetta = True
+        self.sourcepackagename = self.factory.makeSourcePackageName()
+
+        # Two POTemplates share translations if they have the same name,
+        # in this case 'messages'.
+        self.devel_potemplate = self.factory.makePOTemplate(
+            distroseries=self.foo_devel,
+            sourcepackagename=self.sourcepackagename,
+            name="messages")
+        self.stable_potemplate = self.factory.makePOTemplate(
+            distroseries=self.foo_stable,
+            sourcepackagename=self.sourcepackagename,
+            name="messages")
+
+        # We'll use two PO files, one for each series.
+        self.devel_pofile = self.factory.makePOFile(
+            'sr', self.devel_potemplate)
+        self.stable_pofile = self.factory.makePOFile(
+            'sr', self.stable_potemplate)
+
+        # The POTMsgSet is added to only one of the POTemplates.
+        self.potmsgset = self.factory.makePOTMsgSet(
+            self.devel_potemplate, sequence=1)
+
+    def test_getPOTMsgSetWithNewSuggestions_shared(self):
+        # Test listing of suggestions for POTMsgSets with a shared
+        # translation.
+
+        # A POTMsgSet has a shared, current translation created 5 days ago.
+        date_created = datetime.now(pytz.UTC) - timedelta(5)
+        translation = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], date_created=date_created)
+        translation.is_current_ubuntu = True
+
+        # When there are no suggestions, nothing is returned.
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [])
+
+        # When a suggestion is added one day after, the potmsgset is returned.
+        suggestion_date = date_created + timedelta(1)
+        suggestion = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Suggestion"], date_created=suggestion_date)
+        self.assertEquals(suggestion.is_current_ubuntu, False)
+
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [self.potmsgset])
+
+        # Setting a suggestion as current makes it have no unreviewed
+        # suggestions.
+        # XXX henninge 2010-08-17: It looks like this test passes by
+        # accident as the suggestion already is the newest translation
+        # available. Other tests may be passing just by accident, too.
+        # This will have to be investigated when all bits and pieces are in
+        # place.
+        translation.is_current_ubuntu = False
+        suggestion.is_current_ubuntu = True
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [])
+
+        # And adding another suggestion 2 days later, the potmsgset is
+        # again returned.
+        suggestion_date += timedelta(2)
+        translation = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"New suggestion"], date_created=suggestion_date)
+        self.assertEquals(translation.is_current_ubuntu, False)
+
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [self.potmsgset])
+
+    def test_getPOTMsgSetWithNewSuggestions_diverged(self):
+        # Test listing of suggestions for POTMsgSets with a shared
+        # translation and a later diverged one.
+
+        # First we create a shared translation (5 days old), a diverged
+        # translation 1 day later.
+        # Then we make sure that getting unreviewed messages works when:
+        #  * A suggestion is added 1 day after (shows as unreviewed).
+        #  * A new diverged translation is added another day later (nothing).
+        #  * A new suggestion is added after another day (shows).
+        #  * Suggestion is made active (nothing).
+
+        # A POTMsgSet has a shared, current translation created 5 days ago.
+        date_created = datetime.now(pytz.UTC) - timedelta(5)
+        translation = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Shared translation"], date_created=date_created)
+        translation.is_current_ubuntu = True
+
+        # And we also have a diverged translation created a day after a shared
+        # current translation.
+        diverged_date = date_created + timedelta(1)
+        diverged_translation = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Old translation"], date_created=diverged_date)
+        diverged_translation.potemplate = self.devel_potemplate
+        diverged_translation.is_current_ubuntu = True
+
+        # There is also a suggestion against the shared translation
+        # created 2 days after the shared translation.
+        suggestion_date = date_created + timedelta(2)
+        suggestion = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Shared suggestion"], date_created=suggestion_date)
+        self.assertEquals(suggestion.is_current_ubuntu, False)
+
+        # A suggestion is shown since diverged_date < suggestion_date.
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [self.potmsgset])
+
+        # When a diverged translation is added after the shared suggestion,
+        # there are no unreviewed suggestions.
+        diverged_date = suggestion_date + timedelta(1)
+        diverged_translation_2 = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], date_created=diverged_date,
+            date_reviewed=diverged_date, diverged=True)
+        diverged_translation.is_current_ubuntu = False
+        diverged_translation_2.potemplate = self.devel_potemplate
+        diverged_translation_2.is_current_ubuntu = True
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [])
+
+        # When a suggestion is added one day after, the potmsgset is returned.
+        suggestion_date = diverged_date + timedelta(1)
+        suggestion = self.factory.makeSuggestion(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Suggestion"], date_created=suggestion_date)
+        self.assertEquals(suggestion.is_current_ubuntu, False)
+
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [self.potmsgset])
+
+        # Setting a suggestion as current makes it have no unreviewed
+        # suggestions.
+        translation.is_current_ubuntu = False
+        suggestion.is_current_ubuntu = True
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetWithNewSuggestions())
+        self.assertEquals(found_translations, [])
+
+
+>>>>>>> MERGE-SOURCE
 class TestTranslationSharedPOFile(TestCaseWithFactory):
     """Test behaviour of PO files with shared POTMsgSets."""
 
@@ -134,16 +303,26 @@
         self.assertEquals(found_potmsgsets, [plural_potmsgset])
 
         # Search translations as well.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"One translation message"])
         found_potmsgsets = list(
             self.devel_sr_pofile.findPOTMsgSetsContaining(u"translation"))
         self.assertEquals(found_potmsgsets, [potmsgset])
 
         # Search matches all plural forms.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=plural_potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=plural_potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"One translation message",
                           u"Plural translation message",
                           u"Third translation message"])
@@ -183,8 +362,13 @@
         self.assertEquals(found_translations, [])
 
         # If 'submitter' provides a translation, it's returned in a list.
+<<<<<<< TREE
         translation = self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
+=======
+        translation = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"Translation message"],
             translator=submitter)
         found_translations = list(
@@ -194,8 +378,13 @@
         # If somebody else provides a translation, it's not added to the
         # list of submitter's translations.
         someone_else = self.factory.makePerson()
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"Another translation"],
             translator=someone_else)
         found_translations = list(
@@ -210,7 +399,7 @@
 
         self.devel_sr_latin_pofile = self.factory.makePOFile(
             'sr@latin', potemplate=self.devel_potemplate)
-        self.factory.makeTranslationMessage(
+        self.factory.makeCurrentTranslationMessage(
             pofile=self.devel_sr_latin_pofile, potmsgset=potmsgset,
             translations=[u"Yet another translation"],
             translator=submitter)
@@ -238,17 +427,29 @@
         self.assertEquals(found_translations, [])
 
         # When a diverged translation is added, the potmsgset is returned.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [self.potmsgset])
 
         # If diverged translation is empty, POTMsgSet is not listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [])
@@ -258,8 +459,13 @@
         # translation for the POTMsgSet as well.
 
         # We create a shared translation first.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"Shared translation"])
 
         # When there is no diverged translation, shared one is returned.
@@ -268,17 +474,29 @@
         self.assertEquals(found_translations, [self.potmsgset])
 
         # When an empty diverged translation is added, nothing is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [])
 
         # If diverged translation is non-empty, POTMsgSet is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [self.potmsgset])
@@ -288,8 +506,13 @@
         # empty shared translation for the POTMsgSet as well.
 
         # We create an empty shared translation first.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u""])
 
         # When there is no diverged translation, shared one is returned,
@@ -299,17 +522,29 @@
         self.assertEquals(found_translations, [])
 
         # When an empty diverged translation is added, nothing is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [])
 
         # If diverged translation is non-empty, POTMsgSet is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetTranslated())
         self.assertEquals(found_translations, [self.potmsgset])
@@ -319,17 +554,28 @@
         # translated message.
 
         # Add a diverged translation on the included POTMsgSet...
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Diverged translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Diverged translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
 
         # and a shared translation on newly added POTMsgSet...
         potmsgset = self.factory.makePOTMsgSet(self.devel_potemplate,
                                                u"Translated text")
         potmsgset.setSequence(self.devel_potemplate, 2)
 
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"Shared translation"])
 
         # Both POTMsgSets are listed.
@@ -347,17 +593,29 @@
         self.assertEquals(found_translations, [self.potmsgset])
 
         # When a diverged translation is added, the potmsgset is returned.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [])
 
         # If diverged translation is empty, POTMsgSet is not listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [self.potmsgset])
@@ -367,8 +625,13 @@
         # translation for the POTMsgSet as well.
 
         # We create a shared translation first.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u"Shared translation"])
 
         # When there is no diverged translation, shared one is returned.
@@ -377,17 +640,29 @@
         self.assertEquals(found_translations, [])
 
         # When an empty diverged translation is added, nothing is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [self.potmsgset])
 
         # If diverged translation is non-empty, POTMsgSet is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [])
@@ -397,8 +672,13 @@
         # empty shared translation for the POTMsgSet as well.
 
         # We create an empty shared translation first.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u""])
 
         # When there is no diverged translation, shared one is returned,
@@ -408,17 +688,29 @@
         self.assertEquals(found_translations, [self.potmsgset])
 
         # When an empty diverged translation is added, nothing is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u""])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u""], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [self.potmsgset])
 
         # If diverged translation is non-empty, POTMsgSet is listed.
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"])
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"], diverged=True)
+>>>>>>> MERGE-SOURCE
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetUntranslated())
         self.assertEquals(found_translations, [])
@@ -428,8 +720,13 @@
         # untranslated message.
 
         # Add an empty translation to the included POTMsgSet...
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+>>>>>>> MERGE-SOURCE
             translations=[u""])
 
         # ...and a new untranslated POTMsgSet.
@@ -589,9 +886,16 @@
                                                u"Translated text")
         potmsgset.setSequence(self.devel_potemplate, 2)
         date_created = datetime.now(pytz.UTC) - timedelta(5)
+<<<<<<< TREE
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=self.potmsgset,
             translations=[u"Translation"], date_updated=date_created)
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Translation"],
+            date_created=date_created, date_reviewed=date_created)
+>>>>>>> MERGE-SOURCE
         suggestion_date = date_created + timedelta(1)
         self.factory.makeTranslationMessage(
             pofile=self.devel_sr_pofile, potmsgset=potmsgset,
@@ -638,6 +942,7 @@
             self.devel_sr_pofile.getPOTMsgSetWithNewSuggestions())
         self.assertEquals([], found_translations)
 
+<<<<<<< TREE
     def test_getPOTMsgSetChangedInLaunchpad(self):
         # Test listing of POTMsgSets which contain changes from imports.
 
@@ -779,6 +1084,73 @@
         found_translations = list(
             self.devel_sr_pofile.getPOTMsgSetWithErrors())
         self.assertEquals(found_translations, [self.potmsgset])
+=======
+    def _getThisSideFlag(self, translation_message):
+        """Return the value of the "is_current_*" flag on this side."""
+        traits = getUtility(ITranslationSideTraitsSet).getForTemplate(
+            self.devel_potemplate)
+        return traits.getFlag(translation_message)
+
+    def _getOtherSideFlag(self, translation_message):
+        """Return the value of the "is_current_*" flag on the other side."""
+        traits = getUtility(ITranslationSideTraitsSet).getForTemplate(
+            self.devel_potemplate).other_side_traits
+        return traits.getFlag(translation_message)
+
+    def test_getPOTMsgSetDifferentTranslations(self):
+        # Test listing of POTMsgSets which have different translations on
+        # both sides.
+        # This test case is set up with templates and pofiles linked to
+        # product series, therefore they are "upstream" files. As a
+        # consequence "this side" in this test refers to "upstream" and
+        # "other side"  refers to "ubuntu" translations. We keep the generic
+        # terms, though, because the behavior is symmetrical.
+
+        # If there are no translations on either side, nothing is listed.
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(found_translations, [])
+
+        # Adding a current translation on one side doesn't change anything.
+        translation = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"This side translation"])
+        self.assertEquals(self._getThisSideFlag(translation), True)
+        self.assertEquals(self._getOtherSideFlag(translation), False)
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(found_translations, [])
+
+        # Adding a translation on both sides does not introduce a difference.
+        translation = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Both sides translation"], current_other=True)
+        self.assertEquals(self._getThisSideFlag(translation), True)
+        self.assertEquals(self._getOtherSideFlag(translation), True)
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(found_translations, [])
+
+        # Adding a different translation on one side to creates a difference
+        # between this side and the other side.
+        translation = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Different translation"])
+        self.assertEquals(self._getThisSideFlag(translation), True)
+        self.assertEquals(self._getOtherSideFlag(translation), False)
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(found_translations, [self.potmsgset])
+
+        # A diverged translation is different, too.
+        translation = self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile, potmsgset=self.potmsgset,
+            translations=[u"Diverged translation"], diverged=True)
+        self.assertEquals(self._getThisSideFlag(translation), True)
+        self.assertEquals(self._getOtherSideFlag(translation), False)
+        found_translations = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(found_translations, [self.potmsgset])
 
     def test_messageCount(self):
         # POFile.messageCount just forwards to POTmeplate.messageCount.
@@ -789,6 +1161,7 @@
     def test_initial_statistics_consistency(self):
         # A `POFile` starts out with consistent statistics.
         self.assertTrue(self.factory.makePOFile().testStatistics())
+>>>>>>> MERGE-SOURCE
 
     def test_updateStatistics(self):
         # Test that updating statistics keeps working.
@@ -1107,12 +1480,22 @@
     def test_getPOTMsgSetTranslated_ordering(self):
         # Translate both POTMsgSets in devel_sr_pofile, so
         # they are returned with getPOTMsgSetTranslated() call.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+>>>>>>> MERGE-SOURCE
             potmsgset=self.potmsgset1,
             translations=["Shared translation"])
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+>>>>>>> MERGE-SOURCE
             potmsgset=self.potmsgset2,
             translations=["Another shared translation"])
 
@@ -1162,6 +1545,7 @@
         self.assertEquals(untranslated_potmsgsets,
                           [self.potmsgset1, self.potmsgset2])
 
+<<<<<<< TREE
     def test_getPOTMsgSetChangedInLaunchpad_ordering(self):
         # Suggest a translation on both POTMsgSets in devel_sr_pofile,
         # so they are returned with getPOTMsgSetWithNewSuggestions() call.
@@ -1247,6 +1631,51 @@
             self.devel_sr_pofile.getPOTMsgSetWithErrors())
         self.assertEquals(potmsgsets,
                           [self.potmsgset1, self.potmsgset2])
+=======
+    def test_getPOTMsgSetDifferentTranslations_ordering(self):
+        # Suggest a translation on both POTMsgSets in devel_pofile,
+        # so they are returned with getPOTMsgSetDifferentTranslations() call.
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+            potmsgset=self.potmsgset1,
+            translations=["Both sides"],
+            current_other=True)
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+            potmsgset=self.potmsgset1,
+            translations=["This side"])
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+            potmsgset=self.potmsgset2,
+            translations=["Both sides 2"],
+            current_other=True)
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+            potmsgset=self.potmsgset2,
+            translations=["This side 2"])
+
+        potmsgsets = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(
+            [self.potmsgset1, self.potmsgset2], potmsgsets)
+
+        # Insert these two POTMsgSets into self.stable_potemplate in reverse
+        # order.
+        self.potmsgset2.setSequence(self.stable_potemplate, 1)
+        self.potmsgset1.setSequence(self.stable_potemplate, 2)
+
+        # And they are returned in the new order as desired.
+        potmsgsets = list(
+            self.stable_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(
+            [self.potmsgset2, self.potmsgset1], potmsgsets)
+
+        # Order is unchanged for the previous template.
+        potmsgsets = list(
+            self.devel_pofile.getPOTMsgSetDifferentTranslations())
+        self.assertEquals(
+            [self.potmsgset1, self.potmsgset2], potmsgsets)
+>>>>>>> MERGE-SOURCE
 
     def test_getPOTMsgSets_ordering(self):
         # Both POTMsgSets in devel_potemplate are untranslated.
@@ -1278,12 +1707,22 @@
         # This test will go away when potmsgset.sequence goes away.
 
         # Give the method something to search for.
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+>>>>>>> MERGE-SOURCE
             potmsgset=self.potmsgset1,
             translations=["Shared translation"])
+<<<<<<< TREE
         self.factory.makeSharedTranslationMessage(
             pofile=self.devel_sr_pofile,
+=======
+        self.factory.makeCurrentTranslationMessage(
+            pofile=self.devel_pofile,
+>>>>>>> MERGE-SOURCE
             potmsgset=self.potmsgset2,
             translations=["Another shared translation"])
 
@@ -1854,23 +2293,23 @@
 
     def test_getTranslationMessages_current_shared(self):
         # A shared message is included in this POFile's messages.
-        message = self.factory.makeTranslationMessage(
-            potmsgset=self.potmsgset, pofile=self.pofile, force_shared=True)
+        message = self.factory.makeCurrentTranslationMessage(
+            potmsgset=self.potmsgset, pofile=self.pofile)
 
         self.assertEqual(
             [message], list(self.pofile.getTranslationMessages()))
 
     def test_getTranslationMessages_current_diverged(self):
         # A diverged message is included in this POFile's messages.
-        message = self.factory.makeTranslationMessage(
-            potmsgset=self.potmsgset, pofile=self.pofile, force_diverged=True)
+        message = self.factory.makeCurrentTranslationMessage(
+            potmsgset=self.potmsgset, pofile=self.pofile, diverged=True)
 
         self.assertEqual(
             [message], list(self.pofile.getTranslationMessages()))
 
     def test_getTranslationMessages_suggestion(self):
         # A suggestion is included in this POFile's messages.
-        message = self.factory.makeTranslationMessage(
+        message = self.factory.makeSuggestion(
             potmsgset=self.potmsgset, pofile=self.pofile)
 
         self.assertEqual(
@@ -1880,8 +2319,8 @@
         # A message on an obsolete POTMsgSEt is included in this
         # POFile's messages.
         potmsgset = self.factory.makePOTMsgSet(self.potemplate, sequence=0)
-        message = self.factory.makeTranslationMessage(
-            potmsgset=potmsgset, pofile=self.pofile, force_shared=True)
+        message = self.factory.makeCurrentTranslationMessage(
+            potmsgset=potmsgset, pofile=self.pofile)
 
         self.assertEqual(
             [message], list(self.pofile.getTranslationMessages()))
@@ -1889,7 +2328,7 @@
     def test_getTranslationMessages_other_pofile(self):
         # A message from another POFiles is not included.
         other_pofile = self.factory.makePOFile('de')
-        self.factory.makeTranslationMessage(
+        self.factory.makeCurrentTranslationMessage(
             potmsgset=self.potmsgset, pofile=other_pofile)
 
         self.assertEqual([], list(self.pofile.getTranslationMessages()))
@@ -1897,8 +2336,8 @@
     def test_getTranslationMessages_condition_matches(self):
         # A message matching the given condition is included.
         # Diverged messages are linked to a specific POTemplate.
-        message = self.factory.makeTranslationMessage(
-            potmsgset=self.potmsgset, pofile=self.pofile, force_diverged=True)
+        message = self.factory.makeCurrentTranslationMessage(
+            potmsgset=self.potmsgset, pofile=self.pofile, diverged=True)
 
         self.assertContentEqual(
             [message],
@@ -1908,8 +2347,8 @@
     def test_getTranslationMessages_condition_matches_not(self):
         # A message not matching the given condition is excluded.
         # Shared messages are not linked to a POTemplate.
-        self.factory.makeTranslationMessage(
-            potmsgset=self.potmsgset, pofile=self.pofile, force_shared=True)
+        self.factory.makeCurrentTranslationMessage(
+            potmsgset=self.potmsgset, pofile=self.pofile)
 
         self.assertContentEqual(
             [],
@@ -1920,9 +2359,9 @@
         # A message matching given condition but located in another POFile
         # is not included.
         other_pofile = self.factory.makePOFile('de')
-        self.factory.makeTranslationMessage(
+        self.factory.makeCurrentTranslationMessage(
             potmsgset=self.potmsgset, pofile=other_pofile,
-            force_diverged=True)
+            diverged=True)
 
         self.assertContentEqual(
             [],
@@ -1940,9 +2379,9 @@
         other_pofile = other_template.getPOFileByLang(
             self.pofile.language.code)
         self.potmsgset.setSequence(other_template, 1)
-        self.factory.makeTranslationMessage(
+        self.factory.makeCurrentTranslationMessage(
             potmsgset=self.potmsgset, pofile=other_pofile,
-            force_diverged=True)
+            diverged=True)
 
         self.assertEqual([], list(self.pofile.getTranslationMessages()))
 
@@ -2687,3 +3126,48 @@
             potemplate=self.factory.makePOTemplate(
                 distroseries=package.distroseries,
                 sourcepackagename=package.sourcepackagename))
+
+
+class StatistcsFiltersTestScenario(StatisticsTestScenario):
+    """Test the filter functions in `POFile`s compared to statistics."""
+
+    def exerciseFunction(self, pofile):
+        """Run the function under test."""
+        pofile.updateStatistics()
+
+    def getCurrentCount(self, pofile):
+        return pofile.currentCount()
+
+    def getRosettaCount(self, pofile):
+        return pofile.rosettaCount()
+
+    def getTranslatedCount(self, pofile):
+        return pofile.getPOTMsgSetTranslated().count()
+
+    def getUnreviewedCount(self, pofile):
+        return pofile.getPOTMsgSetWithNewSuggestions().count()
+
+    def getUntranslatedCount(self, pofile):
+        return pofile.getPOTMsgSetUntranslated().count()
+
+    def getUpdatesCount(self, pofile):
+        return pofile.getPOTMsgSetDifferentTranslations().count()
+
+
+class TestUpstreamFilters(StatistcsFiltersTestScenario, TestCaseWithFactory):
+    """Test filters on upstream `POFile`s."""
+
+    def makePOFile(self):
+        return self.factory.makePOFile()
+
+
+class TestUbuntuFilters(StatistcsFiltersTestScenario, TestCaseWithFactory):
+    """Test filters on Ubuntu `POFile`s."""
+
+    def makePOFile(self):
+        package = self.factory.makeSourcePackage()
+        return self.factory.makePOFile(
+            potemplate=self.factory.makePOTemplate(
+                distroseries=package.distroseries,
+                sourcepackagename=package.sourcepackagename))
+