Merge lp:~henninge/launchpad/bug-516736-templatename into lp:launchpad

[Henning Eggers]

Template name and translation domain are now suggested from the file path in translation import queue entry.

= Bug 516736 =

Automates extraction of template names and translation domains from the path attribute of import queue entries. This saves having to cut and paste it from the path field, lowser case it and replace underscores with dashes. Very low hanging fruit.

== Test ==

bin/test -vvt TestTranslationImportQueueEntryView

= 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/browser/translationimportqueue.py
  lib/lp/translations/browser/tests/test_translationimportqueueentry.py

== Pylint notices ==

lib/lp/translations/browser/translationimportqueue.py
    17: [F0401] Unable to import 'zope.app.form.interfaces'
    18: [F0401] Unable to import 'zope.component'
    20: [F0401] Unable to import 'zope.schema.interfaces'
    21: [F0401] Unable to import 'zope.schema.vocabulary'

lib/lp/translations/browser/tests/test_translationimportqueueentry.py
    7: [F0401] Unable to import 'pytz'
    10: [F0401] Unable to import 'zope.component'
    11: [F0401] Unable to import 'zope.security.proxy'

[Jeroen T. Vermeulen (jtv)]

Looks good. This could save queue reviewers a lot of time!

Jeroen

review: Approve (code)

[Henning Eggers (henninge)]

Look at the current queue and you'll see that I was worried about my time .... If only those edge updates were running again.

Cheers.

=== modified file 'lib/lp/translations/browser/tests/test_translationimportqueueentry.py'
--- lib/lp/translations/browser/tests/test_translationimportqueueentry.py	2010-02-11 13:17:27 +0000
+++ lib/lp/translations/browser/tests/test_translationimportqueueentry.py	2010-04-19 15:26:34 +0000
@@ -46,13 +46,14 @@
         return view
 
     def _makeEntry(self, productseries=None, distroseries=None,
-                   sourcepackagename=None):
-        filename = self.factory.getUniqueString() + '.pot'
+                   sourcepackagename=None, filename=None, potemplate=None):
+        if filename is None:
+            filename = self.factory.getUniqueString() + '.pot'
         contents = self.factory.getUniqueString()
         entry = self.queue.addOrUpdateEntry(
             filename, contents, False, self.uploader,
             productseries=productseries, distroseries=distroseries,
-            sourcepackagename=sourcepackagename)
+            sourcepackagename=sourcepackagename, potemplate=potemplate)
         return removeSecurityProxy(entry)
 
     def test_import_target_productseries(self):
@@ -142,7 +143,6 @@
         # status_change_date describes the date of the entry's last
         # status change.
         series = self._makeProductSeries()
-        product = series.product
         entry = self._makeEntry(productseries=series)
         view = self._makeView(entry)
 
@@ -159,6 +159,53 @@
         self.assertEqual(
             "Last changed on 2007-08-14.", view.status_change_date)
 
+    def test_initial_values_domain(self):
+        # Without a given potemplate, a translation domain will be suggested
+        # from the file name.
+        series = self._makeProductSeries()
+        entry = self._makeEntry(
+            productseries=series, filename="My_Domain.pot")
+        view = self._makeView(entry)
+
+        self.assertEqual(
+            "My_Domain", view.initial_values['translation_domain'])
+
+    def test_initial_values_existing_domain(self):
+        # With a given potemplate, its translation domain will be presented
+        # as the initial value.
+        domain = self.factory.getUniqueString()
+        series = self._makeProductSeries()
+        potemplate = self.factory.makePOTemplate(
+            productseries=series, translation_domain=domain)
+        entry = self._makeEntry(
+            productseries=series, potemplate=potemplate)
+        view = self._makeView(entry)
+
+        self.assertEqual(domain, view.initial_values['translation_domain'])
+
+    def test_initial_values_potemplate(self):
+        # Without a given potemplate, a name will be suggested from the file
+        # name. The name is converted to be suitable as a template name.
+        series = self._makeProductSeries()
+        entry = self._makeEntry(
+            productseries=series, filename="My_Domain.pot")
+        view = self._makeView(entry)
+
+        self.assertEqual("my-domain", view.initial_values['name'])
+
+    def test_initial_values_existing_potemplate(self):
+        # With a given potemplate, its name will be presented
+        # as the initial value.
+        name = self.factory.getUniqueString()
+        series = self._makeProductSeries()
+        potemplate = self.factory.makePOTemplate(
+            productseries=series, name=name)
+        entry = self._makeEntry(
+            productseries=series, potemplate=potemplate)
+        view = self._makeView(entry)
+
+        self.assertEqual(name, view.initial_values['name'])
+
 
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/translations/browser/translationimportqueue.py'
--- lib/lp/translations/browser/translationimportqueue.py	2010-02-10 13:04:10 +0000
+++ lib/lp/translations/browser/translationimportqueue.py	2010-04-19 15:26:34 +0000
@@ -28,13 +28,14 @@
     HasTranslationImportsView)
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.sourcepackage import ISourcePackageFactory
+from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueueEntry, IEditTranslationImportQueueEntry,
     ITranslationImportQueue, RosettaImportStatus,
     SpecialTranslationImportTargetFilter, TranslationFileType)
-from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.translations.interfaces.pofile import IPOFileSet
 from lp.translations.interfaces.potemplate import IPOTemplateSet
+from lp.translations.utilities.template import make_domain, make_name
 
 from canonical.launchpad.webapp import (
     action, canonical_url, GetitemNavigation, LaunchpadFormView)
@@ -81,12 +82,16 @@
                 field_values['languagepack'] = (
                     self.context.potemplate.languagepack)
         if (file_type in (TranslationFileType.POT,
-                          TranslationFileType.UNSPEC) and
-                          self.context.potemplate is not None):
-            field_values['name'] = (
-                self.context.potemplate.name)
-            field_values['translation_domain'] = (
-                self.context.potemplate.translation_domain)
+                          TranslationFileType.UNSPEC)):
+            potemplate = self.context.potemplate
+            if potemplate is None:
+                domain = make_domain(self.context.path)
+                field_values['name'] = make_name(domain)
+                field_values['translation_domain'] = domain
+            else:
+                field_values['name'] = potemplate.name
+                field_values['translation_domain'] = (
+                    potemplate.translation_domain)
         if file_type in (TranslationFileType.PO, TranslationFileType.UNSPEC):
             field_values['potemplate'] = self.context.potemplate
             if self.context.pofile is not None:

=== modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue-edit-autofilling.txt'
--- lib/lp/translations/stories/importqueue/xx-translation-import-queue-edit-autofilling.txt	2009-09-01 21:03:51 +0000
+++ lib/lp/translations/stories/importqueue/xx-translation-import-queue-edit-autofilling.txt	2010-04-19 15:26:34 +0000
@@ -25,11 +25,13 @@
   <div...Thank you for your upload. 2 files from the tarball...
 
 Let's check the values we get by default from the .pot file. The name field
-is empty.
+and the translation domain field are pre-filled from the name of the file.
 
   >>> browser.open('http://translations.launchpad.dev/+imports/4')
   >>> browser.getControl(name='field.name').value
-  ''
+  'test'
+  >>> browser.getControl(name='field.translation_domain').value
+  'test'
 
 But the path field has been preloaded with the value from the tar ball and
 the file type has been determined correctly from it.