Merge lp:~adiroiban/launchpad/bug-146178 into lp:launchpad

[Adi Roiban]

Add in the UI +latest-delta-language-pack and +latest-full-language-pack links to retrieve latest version of language packs exports.

This is the resubmission of https://code.edge.launchpad.net/~adiroiban/launchpad/bug-146178/+merge/23760, since it was first targeted to db-devel.

Here is the latest diff:

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py 2010-04-21 22:28:02 +0000
+++ lib/lp/registry/interfaces/distroseries.py 2010-04-27 22:14:46 +0000
@@ -53,7 +53,6 @@
 from lp.translations.interfaces.languagepack import ILanguagePack

-
 class DistroSeriesNameField(ContentNameField):
     """A class to ensure `IDistroSeries` has unique names."""
     errormessage = _("%s is already in use by another series.")
@@ -275,8 +274,8 @@
         title=_('Request a full language pack export'), required=True,
         description=_('''
             Whether next language pack generation will be a full export. This
- is useful when update packs are too big and want to merge all
- those changes in the base pack.
+ information is useful when update packs are too big and want to
+ merge all those changes in the base pack.
             '''))

     last_full_language_pack_exported = Object(

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py 2010-04-21 20:52:57 +0000
+++ lib/lp/translations/browser/distroseries.py 2010-04-27 22:21:25 +0000
@@ -124,6 +124,9 @@

     @property
     def have_latest_full_pack(self):
+ """Checks if this distribution series has a full language pack newer
+ than the current one."""
+
         current = self.context.language_pack_base
         latest = self.context.last_full_language_pack_exported
         if (current is None or
@@ -135,6 +138,9 @@

     @property
     def have_latest_delta_pack(self):
+ """Checks if this distribution series has a delta language pack newer
+ than the current one."""
+
         current = self.context.language_pack_delta
         latest = self.context.last_delta_language_pack_exported
         if (current is None or

[Brad Crittenden (bac)]

review: Approve (code)

[Curtis Hovey (sinzui)]

Approved per the original review.

review: Approve (ui)

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2010-04-08 18:40:18 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2010-04-27 22:25:48 +0000
@@ -53,7 +53,6 @@
 from lp.translations.interfaces.languagepack import ILanguagePack
 
 
-
 class DistroSeriesNameField(ContentNameField):
     """A class to ensure `IDistroSeries` has unique names."""
     errormessage = _("%s is already in use by another series.")
@@ -250,33 +249,33 @@
     language_pack_base = Choice(
         title=_('Language pack base'), required=False,
         description=_('''
-            Language pack export with the export of all translations available
-            for this `IDistroSeries` when it was generated. Next delta exports
-            will be generated based on this one.
+            Language pack with the export of all translations
+            available for this distribution series when it was generated. The
+            subsequent update exports will be generated based on this one.
             '''), vocabulary='FilteredFullLanguagePack')
 
     language_pack_delta = Choice(
-        title=_('Language pack delta'), required=False,
+        title=_('Language pack update'), required=False,
         description=_('''
-            Language pack export with the export of all translation updates
-            available for this `IDistroSeries` since language_pack_base was
-            generated.
+            Language pack with the export of all translation updates
+            available for this distribution series since the language pack
+            base was generated.
             '''), vocabulary='FilteredDeltaLanguagePack')
 
     language_pack_proposed = Choice(
         title=_('Proposed language pack update'), required=False,
         description=_('''
-            Base or delta language pack export that is being tested and
-            proposed to be used as the new language_pack_base or
-            language_pack_delta for this `IDistroSeries`.
+            Base or update language pack export that is being tested and
+            proposed to be used as the new language pack base or
+            language pack update for this distribution series.
             '''), vocabulary='FilteredLanguagePack')
 
     language_pack_full_export_requested = Bool(
         title=_('Request a full language pack export'), required=True,
         description=_('''
             Whether next language pack generation will be a full export. This
-            is useful when delta packages are too big and want to merge all
-            those changes in the base package.
+            information is useful when update packs are too big and want to
+            merge all those changes in the base pack.
             '''))
 
     last_full_language_pack_exported = Object(

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2010-02-24 18:33:18 +0000
+++ lib/lp/translations/browser/distroseries.py	2010-04-27 22:25:48 +0000
@@ -122,6 +122,34 @@
 
         return unused_language_packs
 
+    @property
+    def have_latest_full_pack(self):
+        """Checks if this distribution series has a full language pack newer
+        than the current one."""
+
+        current = self.context.language_pack_base
+        latest = self.context.last_full_language_pack_exported
+        if (current is None or
+            latest is None or
+            current.file.http_url == latest.file.http_url):
+            return False
+        else:
+            return True
+
+    @property
+    def have_latest_delta_pack(self):
+        """Checks if this distribution series has a delta language pack newer
+        than the current one."""
+
+        current = self.context.language_pack_delta
+        latest = self.context.last_delta_language_pack_exported
+        if (current is None or
+            latest is None or
+            current.file.http_url == latest.file.http_url):
+            return False
+        else:
+            return True
+
     def _request_full_export(self):
         if (self.old_request_value !=
             self.context.language_pack_full_export_requested):
@@ -135,9 +163,6 @@
                     "Your request has been noted. Next language pack "
                     "export will be made relative to the current base "
                     "language pack.")
-        else:
-            self.request.response.addInfoNotification(
-                "You didn't change anything.")
 
     @action("Change Settings", condition=is_translations_admin)
     def change_action(self, action, data):
@@ -232,7 +257,8 @@
     usedfor = IDistroSeries
     facet = 'translations'
     links = [
-        'translations', 'templates', 'admin', 'language_packs', 'imports']
+        'translations', 'templates', 'admin', 'language_packs',
+        'latest_full_language_pack', 'latest_delta_language_pack', 'imports']
 
     def translations(self):
         return Link('', 'Overview')
@@ -251,6 +277,16 @@
     def language_packs(self):
         return Link('+language-packs', 'Language packs')
 
+    def latest_full_language_pack(self):
+        return Link(
+            '+latest-full-language-pack',
+            'Latest full language pack')
+
+    def latest_delta_language_pack(self):
+        return Link(
+            '+latest-delta-language-pack',
+            'Latest delta language pack')
+
 
 def check_distroseries_translations_viewable(distroseries):
     """Check that these distribution series translations are visible.

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt	2009-09-17 11:10:49 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt	2010-04-27 22:25:48 +0000
@@ -1,4 +1,5 @@
-= Distribution series language packs admin =
+Distribution series language packs admin
+========================================
 
 For each distribution series, we can select several special language packs:
 
@@ -18,57 +19,83 @@
     ...     'http://translations.launchpad.dev/ubuntu/hoary')
     >>> admin_browser.getLink('See all language packs').click()
 
-Initially, there is no package selected.
+Initially, there is no package selected and there are options for choosing a
+base language pack.
 
     >>> base = admin_browser.getControl('Language pack base')
     >>> print base.displayValue
     ['(no value)']
-    >>> delta = admin_browser.getControl('Language pack delta')
+    >>> base.displayOptions
+    ['(no value)', '2007-09-10 19:16:01 UTC', '2007-09-10 19:14:26 UTC']
+    >>> delta = admin_browser.getControl('Language pack update')
     >>> print delta.displayValue
     ['(no value)']
     >>> proposed = admin_browser.getControl('Proposed language pack update')
     >>> print proposed.displayValue
     ['(no value)']
 
-
-    >>> base.displayOptions
-    ['(no value)', '2007-09-10 19:16:01 UTC', '2007-09-10 19:14:26 UTC']
-
 Let's select a base one:
 
-    >>> base.displayValue = ['2007-09-10 19:16:01 UTC']
+    >>> base.displayValue = ['2007-09-10 19:14:26 UTC']
     >>> admin_browser.getControl('Change').click()
     >>> print admin_browser.url
     http://translations.launchpad.dev/ubuntu/hoary/+language-packs
 
-Now the admin page will show us that language pack selected.
+Now the admin page will show us that language pack selected and a list of
+available update packages.
 
     >>> base = admin_browser.getControl('Language pack base')
     >>> print base.displayValue
-    ['2007-09-10 19:16:01 UTC']
-
-Also, that change is shown in the public language pack listing web page:
+    ['2007-09-10 19:14:26 UTC']
+
+    >>> update = admin_browser.getControl('Language pack update')
+    >>> print update.displayValue
+    ['(no value)']
+    >>> update.displayOptions
+    ['(no value)', '2007-09-10 19:15:19 UTC', '2007-09-10 19:15:01 UTC']
+
+Those changes are shown in the public language pack listing web page:
 
     >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary')
     >>> browser.getLink('See all language packs').click()
     >>> print extract_text(find_tag_by_id(browser.contents, "language_packs"))
     A language pack...
     Active language packs
-    Base pack: 2007-09-10 19:16:01 UTC
-    A complete set of translations for the OS.
-    Delta pack:
-    none yet
-    Translation updates, applied on top of the base pack.
+    Base pack: 2007-09-10 19:14:26 UTC
+    Archive containing a complete set of translations
+    for this operating system.
+    Update pack:
+    no update
+    Archive containing translation updates, applied on top of the base pack.
+    Latest language packs
+    Base pack:
+    2007-09-10 19:16:01 UTC
+    Latest archive containing a complete set of translations
+    for this operating system.
+    Update pack:
+    no update
+    Latest archive containing translation updates,
+    applied on top of the base pack.
     Language pack being tested
     No pack is being tested right now.
     Currently unused language packs
+    Full language pack: 2007-09-10 19:16:01 UTC
     Delta language pack: 2007-09-10 19:15:19 UTC
     Delta language pack: 2007-09-10 19:15:01 UTC
-    Full language pack: 2007-09-10 19:14:26 UTC
-
-There is also an option to set/unset whether next language pack generation is
-a full export:
-
+
+The active base language pack URL is linking to an archive, while the latest
+URL uses '+latest-full-language-pack'.
+
+    >>> print browser.getLink('2007-09-10 19:14:26 UTC').url
+    http.../71/ubuntu-hoary-translations.tar.gz
+    >>> print browser.getLink('2007-09-10 19:16:01 UTC').url
+    http://translations.launchpad.dev/ubuntu/hoary/+latest-full-language-pack
+
+An administrator can choose the current update pack and there is also an
+option to set/unset whether next language pack generation is a full export:
+
+    >>> update = admin_browser.getControl('Language pack update')
+    >>> update.displayValue = ['2007-09-10 19:15:01 UTC']
     >>> admin_browser.getControl(
     ...     'Request a full language pack export').selected
     False
@@ -88,6 +115,42 @@
     True
 
 There are no visible user interface changes once this flag is changed. It
-just changes the behaviour of the language pack export, which is executed by cron,
-it will do a full export of translations for this distro series.
+just changes the behaviour of the language pack export, which is executed by
+cron, it will do a full export of translations for this distro series.
+
+The language pack changes are visible on the public language pack page:
+
+    >>> browser.open(
+    ...     'http://translations.launchpad.dev/ubuntu/hoary/+language-packs')
+    >>> print extract_text(find_tag_by_id(browser.contents, "language_packs"))
+    A language pack...
+    Active language packs
+    Base pack: 2007-09-10 19:14:26 UTC
+    Archive containing a complete set of translations
+    for this operating system.
+    Update pack:
+    2007-09-10 19:15:01 UTC
+    Archive containing translation updates, applied on top of the base pack.
+    Latest language packs
+    Base pack:
+    2007-09-10 19:16:01 UTC
+    Latest archive containing a complete set of translations
+    for this operating system.
+    Update pack:
+    2007-09-10 19:15:19 UTC
+    Latest archive containing translation updates,
+    applied on top of the base pack.
+    Language pack being tested
+    No pack is being tested right now.
+    Currently unused language packs
+    Full language pack: 2007-09-10 19:16:01 UTC
+    Delta language pack: 2007-09-10 19:15:19 UTC
+
+The active update language pack URL is linking to an archive, while the latest
+URL uses '+latest-full-language-pack'.
+
+    >>> print browser.getLink('2007-09-10 19:15:01 UTC').url
+    http.../72/ubuntu-hoary-translations-update.tar.gz
+    >>> print browser.getLink('2007-09-10 19:15:19 UTC').url
+    http://translations.launchpad.dev/ubuntu/hoary/+latest-delta-language-pack
 

=== modified file 'lib/lp/translations/templates/distroseries-language-packs.pt'
--- lib/lp/translations/templates/distroseries-language-packs.pt	2009-09-17 11:10:49 +0000
+++ lib/lp/translations/templates/distroseries-language-packs.pt	2010-04-27 22:25:48 +0000
@@ -6,14 +6,6 @@
   metal:use-macro="view/macro:page/main_only"
   i18n:domain="launchpad" >
   <body>
-    <div metal:fill-slot="head_epilogue">
-      <style type="text/css">
-        h2.adminlabel {
-          margin: 1.5em 0 0 0;
-        }
-      </style>
-    </div>
-
     <div metal:fill-slot="main">
      <div id="language_packs">
 
@@ -39,41 +31,86 @@
          </p>
        </div>
        <div class="yui-g">
-         <div class="yui-u first portlet">
+         <div class="yui-u first portlet" id="active-language-packs">
            <h2>Active language packs</h2>
            <dl>
              <dt>
                Base pack:
-               <a tal:condition="context/language_pack_base"
+               <a class="sprite download"
+                  tal:condition="context/language_pack_base"
                   tal:attributes="href context/language_pack_base/file/http_url">
                  <tal:export-date
                     replace="context/language_pack_base/date_exported/fmt:datetime" />
-                 <img tal:condition="context/language_pack_base"
-                      alt="download icon" src="/@@/download" />
                </a>
                <tal:not-export-date condition="not: context/language_pack_base">
                  none yet
                </tal:not-export-date>
              </dt>
-             <dd>A complete set of translations for the OS.</dd>
+             <dd>
+                Archive containing a complete set of translations for this
+                operating system.
+             </dd>
              <dt>
-               Delta pack:
-               <a tal:condition="context/language_pack_delta"
+               Update pack:
+               <a class="sprite download"
+                  tal:condition="context/language_pack_delta"
                   tal:attributes="href context/language_pack_delta/file/http_url">
                  <tal:export-date
                     replace="context/language_pack_delta/date_exported/fmt:datetime" />
-                 <img tal:condition="context/language_pack_delta"
-                      alt="download icon" src="/@@/download" />
                </a>
                <tal:not-export-date condition="not: context/language_pack_delta">
-                 none yet
+                 no update
                </tal:not-export-date>
              </dt>
-             <dd>Translation updates, applied on top of the base pack.</dd>
+             <dd>
+                Archive containing translation updates, applied on top of the
+                base pack.
+             </dd>
            </dl>
          </div>
+
          <div class="yui-u">
-           <div class="portlet">
+           <div>
+            <div id="latest-language-packs" class="portlet">
+            <h2>Latest language packs</h2>
+            <dl>
+             <dt>
+               Base pack:
+               <a class="sprite download"
+                  tal:condition="view/have_latest_full_pack"
+                  tal:attributes="href context/menu:navigation/latest_full_language_pack/url">
+                 <tal:export-date
+                    replace="context/last_full_language_pack_exported/date_exported/fmt:datetime" />
+               </a>
+               <tal:not-export-date
+                    condition="not: view/have_latest_full_pack">
+                 none yet
+               </tal:not-export-date>
+             </dt>
+             <dd>
+                Latest archive containing a complete set of translations for
+                this operating system.
+             </dd>
+             <dt>
+               Update pack:
+               <a class="sprite download"
+                  tal:condition="view/have_latest_delta_pack"
+                  tal:attributes="href context/menu:navigation/latest_delta_language_pack/url">
+                 <tal:export-date
+                    replace="context/last_delta_language_pack_exported/date_exported/fmt:datetime" />
+               </a>
+               <tal:not-export-date
+                    condition="not: view/have_latest_delta_pack">
+                 no update
+               </tal:not-export-date>
+             </dt>
+             <dd>
+                Latest archive containing translation updates, applied on top
+                 of the base pack.
+             </dd>            
+            </dl>
+            </div>
+            <div id="testing-language-packs">
              <h2>Language pack being tested</h2>
              <dl tal:condition="context/language_pack_proposed">
                <dt>
@@ -96,14 +133,14 @@
              <p tal:condition="not:context/language_pack_proposed">
                No pack is being tested right now.
              </p>
+            </div> 
            </div>
          </div>
        </div>
 
        <div class="yui-g">
          <div class="yui-u first portlet" tal:condition="view/is_admin">
-           <h2 class="adminlabel"
-               tal:content="view/adminlabel">Language pack settings</h2>
+           <h2 tal:content="view/adminlabel">Language pack settings</h2>
            <div metal:use-macro="context/@@launchpad_form/form"> </div>
          </div>
          <div class="yui-u" tal:condition="view/unused_language_packs">

=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
--- lib/lp/translations/templates/distroseries-translations.pt	2009-12-16 15:21:36 +0000
+++ lib/lp/translations/templates/distroseries-translations.pt	2010-04-27 22:25:48 +0000
@@ -99,13 +99,12 @@
                 context/distribution/@@+language-pack-admin-info" />
 
             <div>
-              <strong>Current base pack:</strong>
-              <a tal:condition="context/language_pack_base"
+              <strong>Base pack:</strong>
+              <a class="sprite download"
+                 tal:condition="context/language_pack_base"
                  tal:attributes="href context/language_pack_base/file/http_url">
                 <tal:export-date
                    replace="context/language_pack_base/date_exported/fmt:datetime" />
-                <img tal:condition="context/language_pack_base"
-                     alt="download icon" src="/@@/download" />
               </a>
               <tal:not-export-date condition="not: context/language_pack_base">
                 none yet
@@ -113,15 +112,14 @@
             </div>
             <div>
               <strong>Update pack:</strong>
-              <a tal:condition="context/language_pack_delta"
+              <a class="sprite download"
+                 tal:condition="context/language_pack_delta"
                  tal:attributes="href context/language_pack_delta/file/http_url">
                 <tal:export-date
                    replace="context/language_pack_delta/date_exported/fmt:datetime" />
-                <img tal:condition="context/language_pack_delta"
-                     alt="download icon" src="/@@/download" />
               </a>
               <tal:not-export-date condition="not: context/language_pack_delta">
-                none yet
+                no update
               </tal:not-export-date>
             </div>
             <p>