Merge lp:~henninge/launchpad/bug-408899 into lp:launchpad

[Henning Eggers]

[Henning Eggers (henninge)]

= Probelem and fix =

The TranslationBranchApprover creates potemplate names from file names. These names must be a "valid_name" as defined by the database constraint of that name. Unfortunately the conversion method only took underscores into account, converting them to dashes.

This fix makes sure that the names produced conform to the valid_name constraint, most notably making all letters lower case. It also uses sanitize_name to remove all other invalid characters from the name.

= Test =

bin/test -vv -ttemplate_name

= Demo and QA =

Configure a product series to import translation templates from a branch. Push a pot file with capital letters and other invalid characters in it to that branch. Wait for that file to be uploaded to the translation import queue and you can see that it creates a potemplate entry with a valid name. In fact, without this fix it would not have been uploaded at all.

= 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/model/translationbranchapprover.py
  lib/lp/translations/tests/test_translationbranchapprover.py

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'lib/lp/translations/model/translationbranchapprover.py'
--- lib/lp/translations/model/translationbranchapprover.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/model/translationbranchapprover.py	2009-08-06 15:14:02 +0000
@@ -11,6 +11,7 @@
 
 from zope.component import getUtility
 
+from canonical.launchpad.validators.name import sanitize_name
 from lp.translations.interfaces.potemplate import IPOTemplateSet
 from lp.translations.interfaces.translationimportqueue import (
     RosettaImportStatus)
@@ -119,7 +120,7 @@
     @staticmethod
     def makeName(domain):
         """Make a template name from a translation domain."""
-        return domain.replace('_', '-')
+        return sanitize_name(domain.replace('_', '-').lower())
 
     @staticmethod
     def makeNameFromPath(path):

=== modified file 'lib/lp/translations/tests/test_translationbranchapprover.py'
--- lib/lp/translations/tests/test_translationbranchapprover.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/tests/test_translationbranchapprover.py	2009-08-06 15:14:02 +0000
@@ -8,12 +8,13 @@
 from unittest import TestLoader
 from zope.component import getUtility
 
+from canonical.launchpad.validators.name import valid_name
+from canonical.testing import LaunchpadZopelessLayer
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue, RosettaImportStatus)
 from lp.testing import TestCaseWithFactory
 from lp.translations.model.translationbranchapprover import (
     TranslationBranchApprover)
-from canonical.testing import LaunchpadZopelessLayer
 
 class TestTranslationBranchApprover(TestCaseWithFactory):
 
@@ -93,14 +94,15 @@
             translation_domain, entry.potemplate.translation_domain)
 
     def test_template_name(self):
-        # The name should not contain underscores any more.
-        translation_domain = ('translation_domain_with_underscores')
-        template_name = translation_domain.replace('_', '-')
+        # The name is derived from the file name and must be a valid name.
+        translation_domain = (u'Invalid-Name_with illegal#Characters')
         template_path = translation_domain + u'.pot'
         entry = self._upload_file(template_path)
         approver = self._create_approver(template_path)
         approver.approve(entry)
-        self.assertEqual(template_name, entry.potemplate.name)
+        self.assertTrue(valid_name(entry.potemplate.name))
+        self.assertEqual(u'invalid-name-withillegalcharacters',
+                         entry.potemplate.name)
 
     def test_replace_existing_approved(self):
         # Template files that replace existing entries are approved.