Merge lp:~danilo/launchpad/bug-545070 into lp:~launchpad/launchpad/recife

[Данило Шеган]

= Bug 545070 =

Clean-up variable and method names in ExistingPOFileInDatabase for the terminology change for imported/current translations.

= Tests =

 bin/test -vvt superfastimports

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/translations/utilities/translation_import.py
  lib/lp/translations/utilities/tests/test_superfastimports.py

All lp.translations tests have passed as well.

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'lib/lp/translations/utilities/tests/test_superfastimports.py'
--- lib/lp/translations/utilities/tests/test_superfastimports.py	2009-09-14 09:12:58 +0000
+++ lib/lp/translations/utilities/tests/test_superfastimports.py	2010-03-23 14:12:28 +0000
@@ -45,8 +45,10 @@
             pofile=self.pofile, is_imported=False)
         cached_file = ExistingPOFileInDatabase(self.pofile)
         message_data = self.getTranslationMessageData(current_message)
-        self.assertFalse(cached_file.isAlreadyImportedTheSame(message_data))
-        self.assertTrue(cached_file.isAlreadyTranslatedTheSame(message_data))
+        self.assertFalse(
+            cached_file.isAlreadyTranslatedTheSameUpstream(message_data))
+        self.assertTrue(
+            cached_file.isAlreadyTranslatedTheSameInUbuntu(message_data))
 
     def test_imported_messages(self):
         # Make sure current, imported messages are properly
@@ -55,8 +57,10 @@
             pofile=self.pofile, is_imported=True)
         cached_file = ExistingPOFileInDatabase(self.pofile, is_imported=True)
         message_data = self.getTranslationMessageData(imported_message)
-        self.assertTrue(cached_file.isAlreadyImportedTheSame(message_data))
-        self.assertTrue(cached_file.isAlreadyTranslatedTheSame(message_data))
+        self.assertTrue(
+            cached_file.isAlreadyTranslatedTheSameUpstream(message_data))
+        self.assertTrue(
+            cached_file.isAlreadyTranslatedTheSameInUbuntu(message_data))
 
     def test_inactive_messages(self):
         # Make sure non-current messages (i.e. suggestions) are
@@ -65,8 +69,10 @@
             pofile=self.pofile, suggestion=True)
         cached_file = ExistingPOFileInDatabase(self.pofile)
         message_data = self.getTranslationMessageData(inactive_message)
-        self.assertFalse(cached_file.isAlreadyImportedTheSame(message_data))
-        self.assertFalse(cached_file.isAlreadyTranslatedTheSame(message_data))
+        self.assertFalse(
+            cached_file.isAlreadyTranslatedTheSameUpstream(message_data))
+        self.assertFalse(
+            cached_file.isAlreadyTranslatedTheSameInUbuntu(message_data))
 
     def test_query_timeout(self):
         # Test that super-fast-imports doesn't cache anything when it hits
@@ -84,7 +90,8 @@
             pofile=self.pofile, is_imported=False)
         message_data = self.getTranslationMessageData(current_message)
         cached_file = ExistingPOFileInDatabase(self.pofile)
-        self.assertFalse(cached_file.isAlreadyTranslatedTheSame(message_data))
+        self.assertFalse(cached_file.isAlreadyTranslatedTheSameInUbuntu(
+                message_data))
 
         # Restore the old configuration.
         config.pop('super_fast_timeout')

=== modified file 'lib/lp/translations/utilities/translation_import.py'
--- lib/lp/translations/utilities/translation_import.py	2010-02-23 08:25:39 +0000
+++ lib/lp/translations/utilities/translation_import.py	2010-03-23 14:12:28 +0000
@@ -11,7 +11,6 @@
 
 import gettextpo
 import datetime
-import os
 import posixpath
 import pytz
 from zope.component import getUtility
@@ -114,15 +113,15 @@
 
         # Dict indexed by (msgid, context) containing current
         # TranslationMessageData: doing this for the speed.
-        self.messages = {}
+        self.ubuntu_messages = {}
         # Messages which have been seen in the file: messages which exist
         # in the database, but not in the import, will be expired.
         self.seen = set()
 
         # Contains published but inactive translations.
-        self.imported = {}
+        self.upstream_messages = {}
 
-        # Pre-fill self.messages and self.imported with data.
+        # Pre-fill self.ubuntu_messages and self.upstream_messages with data.
         self._fetchDBRows()
 
     def _fetchDBRows(self):
@@ -214,9 +213,9 @@
 
             update_caches = []
             if is_current:
-                update_caches.append(self.messages)
+                update_caches.append(self.ubuntu_messages)
             if is_imported:
-                update_caches.append(self.imported)
+                update_caches.append(self.upstream_messages)
 
             for look_at in update_caches:
                 if (msgid, msgid_plural, context) in look_at:
@@ -248,29 +247,29 @@
         in the file being imported.
         """
         unseen = set()
-        for (singular, plural, context) in self.messages:
+        for (singular, plural, context) in self.ubuntu_messages:
             if (singular, plural, context) not in self.seen:
                 unseen.add((singular, plural, context))
-        for (singular, plural, context) in self.imported:
-            if ((singular, plural, context) not in self.messages and
+        for (singular, plural, context) in self.upstream_messages:
+            if ((singular, plural, context) not in self.ubuntu_messages and
                 (singular, plural, context) not in self.seen):
                 unseen.add((singular, plural, context))
         return unseen
 
-    def isAlreadyTranslatedTheSame(self, message):
+    def isAlreadyTranslatedTheSameInUbuntu(self, message):
         """Check whether this message is already translated in exactly
         the same way.
         """
         (msgid, plural, context) = (message.msgid_singular,
                                     message.msgid_plural,
                                     message.context)
-        if (msgid, plural, context) in self.messages:
-            msg_in_db = self.messages[(msgid, plural, context)]
+        if (msgid, plural, context) in self.ubuntu_messages:
+            msg_in_db = self.ubuntu_messages[(msgid, plural, context)]
             return is_identical_translation(msg_in_db, message)
         else:
             return False
 
-    def isAlreadyImportedTheSame(self, message):
+    def isAlreadyTranslatedTheSameUpstream(self, message):
         """Check whether this translation is already present in DB as
         'is_imported' translation, and thus needs no changing if we are
         submitting an imported update.
@@ -278,12 +277,14 @@
         (msgid, plural, context) = (message.msgid_singular,
                                     message.msgid_plural,
                                     message.context)
-        if ((msgid, plural, context) in self.imported) and self.is_imported:
-            msg_in_db = self.imported[(msgid, plural, context)]
+        if (((msgid, plural, context) in self.upstream_messages) and
+            self.is_imported):
+            msg_in_db = self.upstream_messages[(msgid, plural, context)]
             return is_identical_translation(msg_in_db, message)
         else:
             return False
 
+
 class TranslationImporter:
     """Handle translation resources imports."""
 
@@ -782,10 +783,10 @@
         # Mark this message as seen in the import
         self.pofile_in_db.markMessageAsSeen(message)
         if self.translation_import_queue_entry.is_published:
-            if self.pofile_in_db.isAlreadyImportedTheSame(message):
+            if self.pofile_in_db.isAlreadyTranslatedTheSameUpstream(message):
                 return
         else:
-            if self.pofile_in_db.isAlreadyTranslatedTheSame(message):
+            if self.pofile_in_db.isAlreadyTranslatedTheSameInUbuntu(message):
                 return
 
         potmsgset = self.getOrCreatePOTMsgSet(message)